Merge branch 'UTGuy-master' into 2.1.1-wip

94f9f9de · Mark Otto · 8a2b9f4a · e5060b8d · 94f9f9de
Commit 94f9f9de authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 6 deletions
+3 -6
--- a/less/variables.less
+++ b/less/variables.less
@@ -57,7 +57,6 @@
 @headingsFontWeight:    bold;    // instead of browser default, bold
 @headingsColor:         inherit; // empty to use BS default, @textColor

-
 // Tables
 // -------------------------
 @tableBackground:                   transparent; // overall background-color
@@ -65,7 +64,6 @@
 @tableBackgroundHover:              #f5f5f5; // for hover
 @tableBorder:                       #ddd; // table and cell border

-
 // Buttons
 // -------------------------
 @btnBackground:                     @white;
@@ -107,12 +105,11 @@
 @dropdownDividerBottom:         @white;

 @dropdownLinkColor:             @grayDark;
-
 @dropdownLinkColorHover:        @white;
-@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
-
 @dropdownLinkColorActive:       @dropdownLinkColor;
+
 @dropdownLinkBackgroundActive:  @linkColor;
+@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;



@@ -157,8 +154,8 @@
 @navbarCollapseWidth:             979px;

 @navbarHeight:                    40px;
-@navbarBackground:                darken(@navbarBackgroundHighlight, 5%);
 @navbarBackgroundHighlight:       #ffffff;
+@navbarBackground:                darken(@navbarBackgroundHighlight, 5%);
 @navbarBorder:                    darken(@navbarBackground, 12%);

 @navbarText:                      @gray;