0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00

remove negative margin from .brand in docs, update navbar to support buttons up thurr

This commit is contained in:
Mark Otto 2011-12-27 12:39:39 -06:00
parent 058f47b33b
commit 324246e4f9
4 changed files with 10 additions and 1 deletions

5
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Mon Dec 26 17:12:29 CST 2011
* Date: Tue Dec 27 12:39:01 CST 2011
*/
html, body {
margin: 0;
@ -1215,6 +1215,9 @@ table {
color: #ffffff;
background-color: transparent;
}
.navbar .btn {
margin-top: 5px;
}
.navbar-search {
position: relative;
float: left;

1
bootstrap.min.css vendored
View File

@ -176,6 +176,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;}
.navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
.navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;}
.navbar .btn{margin-top:5px;}
.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;}
.navbar-search .search-query::-webkit-input-placeholder{color:#e6e6e6;}
.navbar-search .search-query:hover{color:#ffffff;background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);}

View File

@ -22,6 +22,7 @@ body {
body > .navbar-fixed .brand {
padding-right: 0;
padding-left: 0;
margin-left: 20px;
float: right;
font-weight: bold;
color: #000;

View File

@ -52,6 +52,10 @@
background-color: transparent;
}
}
// Buttons in navbar
.btn {
margin-top: 5px; // make buttons vertically centered in navbar
}
}
// Navbar search