mirror of
https://github.com/twbs/bootstrap.git
synced 2025-09-29 23:09:05 +02:00
initial pass at removing navbar-inner from .navbar component
This commit is contained in:
Mark Otto
6
docs/assets/css/bootstrap-responsive.css
vendored
6
docs/assets/css/bootstrap-responsive.css
vendored
@@ -590,8 +590,8 @@
|
||||
.navbar-fixed-bottom {
|
||||
margin-top: 20px;
|
||||
}
|
||||
.navbar-fixed-top .navbar-inner,
|
||||
.navbar-fixed-bottom .navbar-inner {
|
||||
.navbar-fixed-top,
|
||||
.navbar-fixed-bottom {
|
||||
padding: 5px;
|
||||
}
|
||||
.navbar .container {
|
||||
@@ -711,7 +711,7 @@
|
||||
.navbar .btn-navbar {
|
||||
display: block;
|
||||
}
|
||||
.navbar-static .navbar-inner {
|
||||
.navbar-static {
|
||||
padding-right: 10px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
64
docs/assets/css/bootstrap.css
vendored
64
docs/assets/css/bootstrap.css
vendored
@@ -4046,40 +4046,28 @@ input[type="submit"].btn::-moz-focus-inner {
|
||||
}
|
||||
|
||||
.navbar {
|
||||
padding: 0 20px;
|
||||
margin-bottom: 20px;
|
||||
overflow: visible;
|
||||
color: #777777;
|
||||
}
|
||||
|
||||
.navbar-inner {
|
||||
min-height: 40px;
|
||||
padding-right: 20px;
|
||||
padding-left: 20px;
|
||||
background-color: #fafafa;
|
||||
background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
|
||||
background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
|
||||
background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
|
||||
background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
|
||||
background-repeat: repeat-x;
|
||||
background-color: #f2f2f2;
|
||||
border: 1px solid #d4d4d4;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
|
||||
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
|
||||
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
|
||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
|
||||
}
|
||||
|
||||
.navbar-inner:before,
|
||||
.navbar-inner:after {
|
||||
.navbar:before,
|
||||
.navbar:after {
|
||||
display: table;
|
||||
line-height: 0;
|
||||
content: "";
|
||||
}
|
||||
|
||||
.navbar-inner:after {
|
||||
.navbar:after {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
@@ -4206,9 +4194,6 @@ input[type="submit"].btn::-moz-focus-inner {
|
||||
.navbar-static-top {
|
||||
position: static;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.navbar-static-top .navbar-inner {
|
||||
-webkit-border-radius: 0;
|
||||
-moz-border-radius: 0;
|
||||
border-radius: 0;
|
||||
@@ -4220,27 +4205,19 @@ input[type="submit"].btn::-moz-focus-inner {
|
||||
right: 0;
|
||||
left: 0;
|
||||
z-index: 1030;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.navbar-fixed-top .navbar-inner,
|
||||
.navbar-static-top .navbar-inner {
|
||||
border-width: 0 0 1px;
|
||||
}
|
||||
|
||||
.navbar-fixed-bottom .navbar-inner {
|
||||
border-width: 1px 0 0;
|
||||
}
|
||||
|
||||
.navbar-fixed-top .navbar-inner,
|
||||
.navbar-fixed-bottom .navbar-inner {
|
||||
padding-right: 0;
|
||||
padding-left: 0;
|
||||
margin-bottom: 0;
|
||||
border-width: 0 0 1px;
|
||||
-webkit-border-radius: 0;
|
||||
-moz-border-radius: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.navbar-fixed-bottom {
|
||||
border-width: 1px 0 0;
|
||||
}
|
||||
|
||||
.navbar-static-top .container,
|
||||
.navbar-fixed-top .container,
|
||||
.navbar-fixed-bottom .container {
|
||||
@@ -4251,8 +4228,8 @@ input[type="submit"].btn::-moz-focus-inner {
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.navbar-fixed-top .navbar-inner,
|
||||
.navbar-static-top .navbar-inner {
|
||||
.navbar-fixed-top,
|
||||
.navbar-static-top {
|
||||
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
|
||||
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
|
||||
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
|
||||
@@ -4260,9 +4237,6 @@ input[type="submit"].btn::-moz-focus-inner {
|
||||
|
||||
.navbar-fixed-bottom {
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
.navbar-fixed-bottom .navbar-inner {
|
||||
-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
|
||||
-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
|
||||
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
|
||||
@@ -4459,18 +4433,8 @@ input[type="submit"].btn::-moz-focus-inner {
|
||||
|
||||
.navbar-inverse {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.navbar-inverse .navbar-inner {
|
||||
background-color: #1b1b1b;
|
||||
background-image: -moz-linear-gradient(top, #222222, #111111);
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
|
||||
background-image: -webkit-linear-gradient(top, #222222, #111111);
|
||||
background-image: -o-linear-gradient(top, #222222, #111111);
|
||||
background-image: linear-gradient(to bottom, #222222, #111111);
|
||||
background-repeat: repeat-x;
|
||||
background-color: #111111;
|
||||
border-color: #252525;
|
||||
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
|
||||
}
|
||||
|
||||
.navbar-inverse .brand,
|
||||
|
||||
@@ -28,6 +28,7 @@ h3 code {
|
||||
|
||||
body > .navbar {
|
||||
font-size: 13px;
|
||||
background-color: rgba(0,0,0,.9);
|
||||
}
|
||||
|
||||
/* Change the docs' brand */
|
||||
|
||||
Reference in New Issue
Block a user