diff options
| author | Mark Otto <[email protected]> | 2013-04-10 22:51:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-04-10 22:51:41 -0700 |
| commit | a35b9b7d0cf3c046f2e8d72fe0de5efdf7918281 (patch) | |
| tree | bf8d5c7b2aae5024a11d617d768f8f9ffaaa7170 | |
| parent | 78df99c8bd6f235a422b5f75524a15223d5aeacd (diff) | |
| parent | 7fb1c1cb89a33b924a8cb44235bfb8124ba10000 (diff) | |
| download | bootstrap-a35b9b7d0cf3c046f2e8d72fe0de5efdf7918281.tar.xz bootstrap-a35b9b7d0cf3c046f2e8d72fe0de5efdf7918281.zip | |
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.
| -rw-r--r-- | less/variables.less | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/less/variables.less b/less/variables.less index 30ac7a59d..cafd3919b 100644 --- a/less/variables.less +++ b/less/variables.less @@ -131,13 +131,12 @@ @dropdown-divider-top: #e5e5e5; @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-bg: @component-active-bg; +@dropdown-link-color: @grayDark; +@dropdown-link-hover-color: #fff; +@dropdown-link-hover-bg: @dropdown-link-active-bg; // COMPONENT VARIABLES @@ -170,11 +169,6 @@ @navbar-text: #777; @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-link-color: #777; @navbar-link-hover-color: #333; @@ -184,15 +178,15 @@ @navbar-link-disabled-color: #ccc; @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 @navbar-inverse-text: @grayLight; @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 @navbar-inverse-link-color: @grayLight; @navbar-inverse-link-hover-color: #fff; @@ -202,6 +196,11 @@ @navbar-inverse-link-disabled-color: #444; @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 // Normal navbar needs no special styles or vars @navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%); |