mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-27 07:14:36 +02:00
Code Issues Releases Wiki 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
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 {
padding: 1px 6px;
padding: 0 6px;
font-size: 10.5px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
@@ -4244,7 +4244,6 @@ input[type="submit"].btn.btn-mini {
*z-index: 2;
margin-bottom: 20px;
overflow: visible;
color: #777777;
}
.navbar-inner {
@@ -4307,6 +4306,7 @@ input[type="submit"].btn.btn-mini {
.navbar-text {
margin-bottom: 0;
line-height: 40px;
color: #777777;
}
.navbar-link {
@@ -4656,10 +4656,6 @@ input[type="submit"].btn.btn-mini {
border-radius: 6px 0 6px 6px;
}
.navbar-inverse {
color: #999999;
}
.navbar-inverse .navbar-inner {
background-color: #1b1b1b;
background-image: -moz-linear-gradient(top, #222222, #111111);
@@ -4683,6 +4679,10 @@ input[type="submit"].btn.btn-mini {
color: #ffffff;
}
.navbar-inverse .navbar-text {
color: #999999;
}
.navbar-inverse .nav > li > a:focus,
.navbar-inverse .nav > li > a:hover {
color: #ffffff;
@@ -4964,7 +4964,7 @@ input[type="submit"].btn.btn-mini {
.pagination-mini ul > li > a,
.pagination-mini ul > li > span {
padding: 1px 6px;
padding: 0 6px;
font-size: 10.5px;
}