0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00

Merge pull request #7528 from acolchado/3.0.0-wip

[3.0.0-wip] Reordering variables that were being used before they were declared. Fixes compiler crashes.
This commit is contained in:
Mark Otto 2013-04-10 22:51:41 -07:00
commit a35b9b7d0c

View File

@ -131,13 +131,12 @@
@dropdown-divider-top: #e5e5e5; @dropdown-divider-top: #e5e5e5;
@dropdown-divider-bottom: #fff; @dropdown-divider-bottom: #fff;
@dropdown-link-color: @grayDark;
@dropdown-link-hover-color: #fff;
@dropdown-link-hover-bg: @dropdown-link-active-bg;
@dropdown-link-active-color: #fff; @dropdown-link-active-color: #fff;
@dropdown-link-active-bg: @component-active-bg; @dropdown-link-active-bg: @component-active-bg;
@dropdown-link-color: @grayDark;
@dropdown-link-hover-color: #fff;
@dropdown-link-hover-bg: @dropdown-link-active-bg;
// COMPONENT VARIABLES // COMPONENT VARIABLES
@ -170,11 +169,6 @@
@navbar-text: #777; @navbar-text: #777;
@navbar-bg: #eee; @navbar-bg: #eee;
// Navbar brand label
@navbar-brand-color: @navbar-link-color;
@navbar-brand-hover-color: darken(@navbar-link-color, 10%);
@navbar-brand-hover-bg: transparent;
// Navbar links // Navbar links
@navbar-link-color: #777; @navbar-link-color: #777;
@navbar-link-hover-color: #333; @navbar-link-hover-color: #333;
@ -184,15 +178,15 @@
@navbar-link-disabled-color: #ccc; @navbar-link-disabled-color: #ccc;
@navbar-link-disabled-bg: transparent; @navbar-link-disabled-bg: transparent;
// Navbar brand label
@navbar-brand-color: @navbar-link-color;
@navbar-brand-hover-color: darken(@navbar-link-color, 10%);
@navbar-brand-hover-bg: transparent;
// Inverted navbar // Inverted navbar
@navbar-inverse-text: @grayLight; @navbar-inverse-text: @grayLight;
@navbar-inverse-bg: #222; @navbar-inverse-bg: #222;
// Inverted navbar brand label
@navbar-inverse-brand-color: @navbar-inverse-link-color;
@navbar-inverse-brand-hover-color: #fff;
@navbar-inverse-brand-hover-bg: transparent;
// Inverted navbar links // Inverted navbar links
@navbar-inverse-link-color: @grayLight; @navbar-inverse-link-color: @grayLight;
@navbar-inverse-link-hover-color: #fff; @navbar-inverse-link-hover-color: #fff;
@ -202,6 +196,11 @@
@navbar-inverse-link-disabled-color: #444; @navbar-inverse-link-disabled-color: #444;
@navbar-inverse-link-disabled-bg: transparent; @navbar-inverse-link-disabled-bg: transparent;
// Inverted navbar brand label
@navbar-inverse-brand-color: @navbar-inverse-link-color;
@navbar-inverse-brand-hover-color: #fff;
@navbar-inverse-brand-hover-bg: transparent;
// Inverted navbar search // Inverted navbar search
// Normal navbar needs no special styles or vars // Normal navbar needs no special styles or vars
@navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); @navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%);