diff options
| author | Mark Otto <otto@github.com> | 2012-11-05 10:50:07 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-11-05 10:50:07 +0400 |
| commit | d38bda1480377f2ce8154afd9b538ea104b9e949 (patch) | |
| tree | afaf4b94fb51b58ac19d45c8b485a4ed17cd833e /less | |
| parent | 62c78e46f8d027d0797c66bef5ce8cdb8d667ace (diff) | |
Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 10 | ||||
| -rw-r--r-- | less/variables.less | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/less/navbar.less b/less/navbar.less index f69e048994..532c5926b8 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -10,7 +10,6 @@ .navbar { overflow: visible; margin-bottom: @baseLineHeight; - color: @navbarText; // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar *position: relative; @@ -67,6 +66,7 @@ .navbar-text { margin-bottom: 0; line-height: @navbarHeight; + color: @navbarText; } // Janky solution for now to account for links outside the .nav @@ -379,7 +379,6 @@ // ------------------------- .navbar-inverse { - color: @navbarInverseText; .navbar-inner { #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); @@ -395,6 +394,10 @@ } } + .navbar-text { + color: @navbarInverseText; + } + .nav > li > a:focus, .nav > li > a:hover { background-color: @navbarInverseLinkBackgroundHover; @@ -470,6 +473,3 @@ } } - - - diff --git a/less/variables.less b/less/variables.less index 7b70f44dbf..de36074fd9 100644 --- a/less/variables.less +++ b/less/variables.less @@ -68,7 +68,7 @@ @paddingLarge: 11px 19px; // 44px @paddingSmall: 2px 10px; // 26px -@paddingMini: 1px 6px; // 24px +@paddingMini: 0 6px; // 22px @baseBorderRadius: 4px; @borderRadiusLarge: 6px; |