diff options
| author | Mark Otto <[email protected]> | 2012-03-10 11:23:05 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-10 11:23:05 -0800 |
| commit | 305374ab1a49a1bdfbab0e52a2be218fc42f3cc0 (patch) | |
| tree | d20f1eaae7a77b6fc8301b102d56dad0cce765c1 /less | |
| parent | a613a8ebd01ab9206bc1a84a0bf6945a1238aa5e (diff) | |
| download | bootstrap-305374ab1a49a1bdfbab0e52a2be218fc42f3cc0.tar.xz bootstrap-305374ab1a49a1bdfbab0e52a2be218fc42f3cc0.zip | |
clear up nav variables
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 22 |
2 files changed, 23 insertions, 3 deletions
diff --git a/less/navbar.less b/less/navbar.less index 77cdf7a7a..75ad1336d 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -233,9 +233,9 @@ // Active nav items .navbar .nav .active > a, .navbar .nav .active > a:hover { - color: @navbarLinkColorHover; + color: @navbarLinkColorActive; text-decoration: none; - background-color: @navbarBackground; + background-color: @navbarLinkBackgroundActive; } // Dividers (basically a vertical hr) diff --git a/less/variables.less b/less/variables.less index 74290b7ba..21585cb6d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -105,10 +105,12 @@ + // 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; @@ -118,32 +120,46 @@ @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; + // Navbar +// ------------------------- @navbarHeight: 40px; @navbarBackground: @grayDarker; @navbarBackgroundHighlight: @grayDark; -@navbarLinkBackgroundHover: transparent; @navbarText: @grayLight; @navbarLinkColor: @grayLight; @navbarLinkColorHover: @white; +@navbarLinkColorActive: @navbarLinkColorHover; +@navbarLinkBackgroundHover: transparent; +@navbarLinkBackgroundActive: @navbarBackground; + // Hero unit +// ------------------------- @heroUnitBackground: #312f2e; @heroUnitHeadingColor: @white; @heroUnitLeadColor: @white; + // Form states and alerts +// ------------------------- @warningText: #c09853; @warningBackground: #fcf8e3; @warningBorder: darken(spin(@warningBackground, -10), 3%); @@ -162,15 +178,19 @@ + // GRID // -------------------------------------------------- // Default 940px grid +// ------------------------- @gridColumns: 12; @gridColumnWidth: 60px; @gridGutterWidth: 20px; @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); + // Fluid grid +// ------------------------- @fluidGridColumnWidth: 6.382978723%; @fluidGridGutterWidth: 2.127659574%; |