diff options
author | Mark Otto <markotto@twitter.com> | 2012-03-10 23:23:05 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-03-10 23:23:05 +0400 |
commit | 305374ab1a49a1bdfbab0e52a2be218fc42f3cc0 (patch) | |
tree | d20f1eaae7a77b6fc8301b102d56dad0cce765c1 | |
parent | a613a8ebd01ab9206bc1a84a0bf6945a1238aa5e (diff) |
clear up nav variables
-rw-r--r-- | docs/assets/bootstrap.zip | bin | 54989 -> 54996 bytes | |||
-rw-r--r-- | docs/assets/css/bootstrap.css | 5 | ||||
-rw-r--r-- | less/navbar.less | 4 | ||||
-rw-r--r-- | less/variables.less | 22 |
4 files changed, 26 insertions, 5 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex c153c6e8b8..b317f29364 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9854e974ca..3a79af2067 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -310,8 +310,9 @@ h4, h5, h6 { margin: 0; - font-weight: bold; - color: #333333; + font-family: ''; + font-weight: normal; + color: ''; text-rendering: optimizelegibility; } h1 small, diff --git a/less/navbar.less b/less/navbar.less index 77cdf7a7a8..75ad1336de 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 74290b7bae..21585cb6df 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%; |