rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading

Browse Source
This commit is contained in:
Mark Otto 2012-11-04 22:50:07 -08:00
parent 62c78e46f8
commit d38bda1480
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/assets/css/bootstrap.css vendored
View File

@ -3244,7 +3244,7 @@ button.close {
} }
.btn-mini { .btn-mini {
padding: 1px 6px; padding: 0 6px;
font-size: 10.5px; font-size: 10.5px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
@ -4244,7 +4244,6 @@ input[type="submit"].btn.btn-mini {
*z-index: 2; *z-index: 2;
margin-bottom: 20px; margin-bottom: 20px;
overflow: visible; overflow: visible;
color: #777777;
} }
.navbar-inner { .navbar-inner {
@ -4307,6 +4306,7 @@ input[type="submit"].btn.btn-mini {
.navbar-text { .navbar-text {
margin-bottom: 0; margin-bottom: 0;
line-height: 40px; line-height: 40px;
color: #777777;
} }
.navbar-link { .navbar-link {
@ -4656,10 +4656,6 @@ input[type="submit"].btn.btn-mini {
border-radius: 6px 0 6px 6px; border-radius: 6px 0 6px 6px;
} }
.navbar-inverse {
color: #999999;
}
.navbar-inverse .navbar-inner { .navbar-inverse .navbar-inner {
background-color: #1b1b1b; background-color: #1b1b1b;
background-image: -moz-linear-gradient(top, #222222, #111111); background-image: -moz-linear-gradient(top, #222222, #111111);
@ -4683,6 +4679,10 @@ input[type="submit"].btn.btn-mini {
color: #ffffff; color: #ffffff;
} }
.navbar-inverse .navbar-text {
color: #999999;
}
.navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:focus,
.navbar-inverse .nav > li > a:hover { .navbar-inverse .nav > li > a:hover {
color: #ffffff; color: #ffffff;
@ -4964,7 +4964,7 @@ input[type="submit"].btn.btn-mini {
.pagination-mini ul > li > a, .pagination-mini ul > li > a,
.pagination-mini ul > li > span { .pagination-mini ul > li > span {
padding: 1px 6px; padding: 0 6px;
font-size: 10.5px; font-size: 10.5px;
} }

10
less/navbar.less
View File

@ -10,7 +10,6 @@
.navbar { .navbar {
overflow: visible; overflow: visible;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
color: @navbarText;
// Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
*position: relative; *position: relative;
@ -67,6 +66,7 @@
.navbar-text { .navbar-text {
margin-bottom: 0; margin-bottom: 0;
line-height: @navbarHeight; line-height: @navbarHeight;
color: @navbarText;
} }
// Janky solution for now to account for links outside the .nav // Janky solution for now to account for links outside the .nav
@ -379,7 +379,6 @@
// ------------------------- // -------------------------
.navbar-inverse { .navbar-inverse {
color: @navbarInverseText;
.navbar-inner { .navbar-inner {
#gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
@ -395,6 +394,10 @@
} }
} }
.navbar-text {
color: @navbarInverseText;
}
.nav > li > a:focus, .nav > li > a:focus,
.nav > li > a:hover { .nav > li > a:hover {
background-color: @navbarInverseLinkBackgroundHover; background-color: @navbarInverseLinkBackgroundHover;
@ -470,6 +473,3 @@
} }
} }

2
less/variables.less
View File

@ -68,7 +68,7 @@
@paddingLarge: 11px 19px; // 44px @paddingLarge: 11px 19px; // 44px
@paddingSmall: 2px 10px; // 26px @paddingSmall: 2px 10px; // 26px
@paddingMini: 1px 6px; // 24px @paddingMini: 0 6px; // 22px
@baseBorderRadius: 4px; @baseBorderRadius: 4px;
@borderRadiusLarge: 6px; @borderRadiusLarge: 6px;