Merge branch 'MDL-53152-master' of git://github.com/junpataleta/moodle

theme/bootstrapbase/less/bootstrap/variables.less

@@ -62,9 +62,9 @@
 // -------------------------
 // Based on 14px font-size and 20px line-height
 
-@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
-@fontSizeSmall:         @baseFontSize * 0.85; // ~12px
-@fontSizeMini:          @baseFontSize * 0.75; // ~11px
+@fontSizeLarge:         (@baseFontSize * 1.25); // ~18px
+@fontSizeSmall:         (@baseFontSize * 0.85); // ~12px
+@fontSizeMini:          (@baseFontSize * 0.75); // ~11px
 
 @paddingLarge:          11px 19px; // 44px
 @paddingSmall:          2px 10px;  // 26px
@@ -114,7 +114,7 @@
 @inputBorderRadius:             @baseBorderRadius;
 @inputDisabledBackground:       @grayLighter;
 @formActionsBackground:         #f5f5f5;
-@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+@inputHeight:                   (@baseLineHeight + 10px); // base line-height + 8px vertical padding + 2px top/bottom border
 
 
 // Dropdowns
@@ -178,7 +178,7 @@
 // Navbar
 // -------------------------
 @navbarCollapseWidth:             979px;
-@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
+@navbarCollapseDesktopWidth:      (@navbarCollapseWidth + 1);
 
 @navbarHeight:                    40px;
 @navbarBackgroundHighlight:       #ffffff;
@@ -260,7 +260,7 @@
 @popoverTitleBackground:  darken(@popoverBackground, 3%);
 
 // Special enhancement for popovers
-@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
+@popoverArrowOuterWidth:  (@popoverArrowWidth + 1);
 @popoverArrowOuterColor:  rgba(0,0,0,.25);
 
 
@@ -274,17 +274,17 @@
 @gridColumns:             12;
 @gridColumnWidth:         60px;
 @gridGutterWidth:         20px;
-@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+@gridRowWidth:            ((@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)));
 
 // 1200px min
 @gridColumnWidth1200:     70px;
 @gridGutterWidth1200:     30px;
-@gridRowWidth1200:        (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
+@gridRowWidth1200:        ((@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)));
 
 // 768px-979px
 @gridColumnWidth768:      42px;
 @gridGutterWidth768:      20px;
-@gridRowWidth768:         (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
+@gridRowWidth768:         ((@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1)));
 
 
 // Fluid grid

theme/bootstrapbase/readme_moodle.txt

@@ -37,3 +37,17 @@ https://github.com/aFarkas/html5shiv/blob/master/src/html5shiv.js
 To update to the latest release of html5shiv:
 * download and replace: javascript/html5shiv.js
 * update ./thirdpartylibs.xml
+
+variables.less
+------------
+The calculations for the following variables have been enclosed in parentheses in order for them to be correctly output
+in the compiled CSS (MDL-53152):
+* @fontSizeLarge
+* @fontSizeSmall
+* @fontSizeMini
+* @inputHeight
+* @navbarCollapseDesktopWidth
+* @popoverArrowOuterWidth
+* @gridRowWidth
+* @gridRowWidth1200
+* @gridRowWidth768