diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c153c6e8b8b7082a325720e60969c621564ee641..b317f29364a4203401a39ff80770a7476ce47220 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9854e974cae5a471d93efa7f1c050bdc8f312674..3a79af2067a4620af2d9817dacaba0669d363260 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 77cdf7a7a8f3f8fd376b4499cf644a4e9ee4d43c..75ad1336de5614e94ee3721c4c36c862043eec1a 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 74290b7bae991efca72bee739fe765255edf3807..21585cb6dfaa181a3c5fe25ff35913821b29132c 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%;