merging microbit changes

2016-11-01 08:35:45 -07:00
parent 67eb1d3b19 4963bf776a
commit 94e72784b9
66 changed files with 26504 additions and 697 deletions
--- a/theme/site/collections/menu.variables
+++ b/theme/site/collections/menu.variables
@@ -10,4 +10,4 @@
 *******************************/

@mainMenuHeight: 5rem;
-@mainMenuMinHeight: (@itemVerticalPadding * 2) + 2em;
+@mainMenuMinHeight: (@itemVerticalPadding * 2) + 2em;
--- a/theme/site/elements/input.overrides
+++ b/theme/site/elements/input.overrides
@@ -12,4 +12,4 @@

 .rtl .ui.inverted.input input {
    padding-right: 0.6em !important;
-}
+}
--- a/theme/site/globals/site.variables
+++ b/theme/site/globals/site.variables
@@ -36,3 +36,4 @@
 *******************************/

@blocklyToolboxColor: #F6F4E6;
+