merging master

2016-11-09 13:20:18 -08:00
parent 94e72784b9 b6b18b7ceb
commit 0b144539f3
22 changed files with 498 additions and 263 deletions
--- a/theme/site/globals/site.variables
+++ b/theme/site/globals/site.variables
@ -35,5 +35,8 @@
         PXT Overrides
 *******************************/

+@mainMenuHeight: 5rem;
+@mobileMenuHeight: 5rem;
+
@blocklyToolboxColor: #F6F4E6;

--- a/theme/style.less
+++ b/theme/style.less
@ -1,5 +1,6 @@
 /* Import all components */
@import 'semantic';
+@import 'pxt';
@import 'themes/default/globals/site.variables';
@import 'themes/pxt/globals/site.variables';
@import 'site/globals/site.variables';