Fix: Tidy up Bootstrap override LESS.

gjb2048 · Oct 16, 2016 · 016ca09 · 016ca09
1 parent 42d1624
commit 016ca09
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 289 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,7 @@
+New in 3.0.1.12
+===============
+- FIX: Tidy up Bootstrap override LESS.
+
 New in 3.0.1.11
 ===============
 - REFIX: Issue #747: Profile picture in user profile missing.

diff --git a/less/bootstrap-override/variables.less b/less/bootstrap-override/variables.less
@@ -2,289 +2,19 @@
 // Variables
 // --------------------------------------------------
 
-// Global values
-// --------------------------------------------------
-
 // Grays
 // -------------------------
-@black: #000;
-@grayDarker: #222;
-@grayDark: #333;
-@gray: #555;
-@grayLight: #999;
 @grayLightish: #e7e7e7;
-@grayLighter: #eee;
 @grayBright: #f1f1f1;
-@white: #fff;
-
-// Accent colors
-// -------------------------
-@blue: #049cdb;
-@blueDark: #0064cd;
-@green: #46a546;
-@red: #9d261d;
-@yellow: #ffc40d;
-@orange: #f89406;
-@pink: #c3325f;
-@purple: #7a43b6;
-
-// Scaffolding
-// -------------------------
-@bodyBackground: @white;
-@textColor: @grayDark;
-
-// Links
-// -------------------------
-@linkColor: #08c;
-@linkColorHover: darken(@linkColor, 15%);
-
-// Typography
-// -------------------------
-@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
-@serifFontFamily: Georgia, "Times New Roman", Times, serif;
-@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
-
-@baseFontSize: 14px;
-@baseFontFamily: @sansFontFamily;
-@baseLineHeight: 20px;
-@altFontFamily: @serifFontFamily;
-
-@headingsFontFamily: inherit;
-// empty to use BS default, @baseFontFamily
-@headingsFontWeight: bold;
-// instead of browser default, bold
-@headingsColor: inherit;
-// empty to use BS default, @textColor
-
-// Component sizing
-// -------------------------
-// Based on 14px font-size and 20px line-height
-
-@fontSizeLarge: @baseFontSize * 1.25;
-// ~18px
-@fontSizeSmall: @baseFontSize * 0.85;
-// ~12px
-@fontSizeMini: @baseFontSize * 0.75;
-// ~11px
-
-@paddingLarge: 11px 19px;
-// 44px
-@paddingSmall: 2px 10px;
-// 26px
-@paddingMini: 0 6px;
-// 22px
-
-@baseBorderRadius: 4px;
-@borderRadiusLarge: 6px;
-@borderRadiusSmall: 3px;
-
-// Tables
-// -------------------------
-@tableBackground: transparent;
-// overall background-color
-@tableBackgroundAccent: #f9f9f9;
-// for striping
-@tableBackgroundHover: #f5f5f5;
-// for hover
-@tableBorder: #ddd;
-// table and cell border
 
 // Buttons
 // -------------------------
-@btnBackground: @white;
-@btnBackgroundHighlight: darken(@white, 10%);
-@btnBorder: #ccc;
-
 @btnPrimaryBackground: #08c;
 @btnPrimaryBackgroundHighlight: #04c;
-
-@btnInfoBackground: #5bc0de;
-@btnInfoBackgroundHighlight: #2f96b4;
-
-@btnSuccessBackground: #62c462;
-@btnSuccessBackgroundHighlight: #51a351;
-
-@btnWarningBackground: lighten(@orange, 15%);
-@btnWarningBackgroundHighlight: @orange;
-
-@btnDangerBackground: #ee5f5b;
-@btnDangerBackgroundHighlight: #bd362f;
-
-@btnInverseBackground: #444;
-@btnInverseBackgroundHighlight: @grayDarker;
-
-// Forms
-// -------------------------
-@inputBackground: @white;
-@inputBorder: #ccc;
-@inputBorderRadius: @baseBorderRadius;
-@inputDisabledBackground: @grayLighter;
-@formActionsBackground: #f5f5f5;
-@inputHeight: @baseLineHeight + 10px;
-// base line-height + 8px vertical padding + 2px top/bottom border
-
-// Dropdowns
-// -------------------------
-@dropdownBackground: @white;
-@dropdownBorder: rgba(0, 0, 0, .2);
-@dropdownDividerTop: #e5e5e5;
-@dropdownDividerBottom: @white;
-
-@dropdownLinkColor: @grayDark;
-@dropdownLinkColorHover: @white;
-@dropdownLinkColorActive: @white;
-
-@dropdownLinkBackgroundActive: @linkColor;
-@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-@zindexDropdown: 1000;
-@zindexPopover: 1010;
-@zindexTooltip: 1030;
-@zindexFixedNavbar: 1030;
-@zindexModalBackdrop: 1040;
-@zindexModal: 1050;
-
-// Sprite icons path
-// -------------------------
-@iconSpritePath: "../img/glyphicons-halflings.png";
-@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
-
-// Input placeholder text color
-// -------------------------
-@placeholderText: @grayLight;
-
-// Hr border color
-// -------------------------
-@hrBorder: @grayLighter;
-
-// Horizontal forms & lists
-// -------------------------
-@horizontalComponentOffset: 180px;
-
-// Wells
-// -------------------------
-@wellBackground: #f5f5f5;
-
-// Navbar
-// -------------------------
-@navbarCollapseWidth: 979px;
-@navbarCollapseDesktopWidth: 980px;
-
-@navbarHeight: 40px;
-@navbarBackgroundHighlight: #ffffff;
-@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
-@navbarBorder: darken(@navbarBackground, 12%);
-
-@navbarText: #777;
-@navbarLinkColor: #777;
-@navbarLinkColorHover: @grayDark;
-@navbarLinkColorActive: @gray;
-@navbarLinkBackgroundHover: transparent;
-@navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
-
-@navbarBrandColor: @navbarLinkColor;
-
-// Inverted navbar
-@navbarInverseBackground: #111111;
-@navbarInverseBackgroundHighlight: #222222;
-@navbarInverseBorder: #252525;
-
-@navbarInverseText: @grayLight;
-@navbarInverseLinkColor: @grayLight;
-@navbarInverseLinkColorHover: @white;
-@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
-@navbarInverseLinkBackgroundHover: transparent;
-@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
-
-@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
-@navbarInverseSearchBackgroundFocus: @white;
-@navbarInverseSearchBorder: @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor: #ccc;
-
-@navbarInverseBrandColor: @navbarInverseLinkColor;
-
-// Pagination
-// -------------------------
-@paginationBackground: #fff;
-@paginationBorder: #ddd;
-@paginationActiveBackground: #f5f5f5;
-
-// Hero unit
-// -------------------------
-@heroUnitBackground: @grayLighter;
-@heroUnitHeadingColor: inherit;
-@heroUnitLeadColor: inherit;
-
 // Form states and alerts
 // -------------------------
-@warningText: #8a6d3b;
-@warningBackground: #fcf8e3;
-@warningBorder: darken(spin(@warningBackground, -10), 3%);
-
-@errorText: #b94a48;
-@errorBackground: #f2dede;
-@errorBorder: darken(spin(@errorBackground, -10), 3%);
-
-@successText: #468847;
-@successBackground: #dff0d8;
-@successBorder: darken(spin(@successBackground, -10), 5%);
-
-@infoText: #3a87ad;
-@infoBackground: #d9edf7;
-@infoBorder: darken(spin(@infoBackground, -10), 7%);
-
-// Tooltips and popovers
-// -------------------------
-@tooltipColor: #fff;
-@tooltipBackground: #000;
-@tooltipArrowWidth: 5px;
-@tooltipArrowColor: @tooltipBackground;
-
-@popoverBackground: #fff;
-@popoverArrowWidth: 10px;
-@popoverArrowColor: #fff;
-@popoverTitleBackground: darken(@popoverBackground, 3%);
-
-// Special enhancement for popovers
-@popoverArrowOuterWidth: @popoverArrowWidth + 1;
-@popoverArrowOuterColor: rgba(0, 0, 0, .25);
+@warningText:             #8a6d3b;
 
-// GRID
-// --------------------------------------------------
-
-// Default 940px grid
-// -------------------------
-@gridColumns: 12;
-@gridColumnWidth: 60px;
-@gridGutterWidth: 20px;
-@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-
-// 1200px min
-@gridColumnWidth1200: 70px;
-@gridGutterWidth1200: 30px;
-@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
-
-// 768px-979px
-@gridColumnWidth768: 42px;
-@gridGutterWidth768: 20px;
-@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
-
-// Fluid grid
+// Navbar
 // -------------------------
-@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
-@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
-
-// 1200px min
-@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
-@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
-
-// 768px-979px
-@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
-@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
+@navbarCollapseDesktopWidth: 980px;
diff --git a/less/essential.less b/less/essential.less
@@ -11,7 +11,9 @@
 @import "moodle/plugins/mod/quiz";
 
 // Import the bootstrap variables.
-@import "bootstrap-override/variables";
+@import "bootstrap/variables";
+// Upstream Bootstrap.
+@import "bootstrap-override/bootstrap";
 // Old Moodle stuff from base theme.
 // Massive, needs broken up.
 @import "moodle/core";
@@ -22,8 +24,6 @@
 @import "moodle/message";
 @import "moodle/question";
 @import "moodle/user";
-// Upstream Bootstrap.
-@import "bootstrap-override/bootstrap";
 // Override Bootstrap defaults.
 @import "moodle/bootstrapoverride";
 

diff --git a/less/essential/settings/navigation.less b/less/essential/settings/navigation.less
@@ -14,7 +14,7 @@
 
 @media (min-width: @navbarCollapseDesktopWidth) {
   #essentialnavbar.oldnavbar.nologo {
-        top: 64px;
+    top: 64px;
   }
 }
 

diff --git a/style/essential-rtl.css b/style/essential-rtl.css
diff --git a/style/essential-rtl_ie9-blessed1.css b/style/essential-rtl_ie9-blessed1.css
diff --git a/style/essential-rtl_ie9.css b/style/essential-rtl_ie9.css
diff --git a/style/essential.css b/style/essential.css
diff --git a/style/essential_ie9-blessed1.css b/style/essential_ie9-blessed1.css
diff --git a/style/essential_ie9.css b/style/essential_ie9.css
diff --git a/version.php b/version.php
@@ -27,9 +27,9 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2016010216; // YYYYMMDDVV.
+$plugin->version = 2016010217; // YYYYMMDDVV.
 $plugin->maturity = MATURITY_STABLE; // This version's maturity level.
-$plugin->release = '3.0.1.11 (Build: 2016010216)';
+$plugin->release = '3.0.1.12 (Build: 2016010217)';
 $plugin->requires  = 2015111600.00; // 3.0 (Build: 20151116).
 $plugin->component = 'theme_essential';
 $plugin->dependencies = array();