2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00

fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar

This commit is contained in:
Mark Otto
2012-01-05 23:24:19 -08:00
parent 7582520808
commit 5cb76037ae
7 changed files with 18 additions and 16 deletions
+2 -1
View File
@@ -372,9 +372,10 @@ input::-webkit-input-placeholder {
// SEARCH FORM
// -----------
.search-form .search-query {
.search-query {
padding-left: 14px;
padding-right: 14px;
margin-bottom: 0; // remove the default margin on all inputs
.border-radius(14px);
}
+2 -1
View File
@@ -153,7 +153,7 @@
background-color: rgba(0,0,0,.5);
}
// Dividers (basically a vertical hr)
.divider {
.vertical-divider {
height: 40px;
width: 1px;
margin: 0 5px;
@@ -188,6 +188,7 @@
}
}
li a {
padding: 4px 15px;
color: #999;
text-shadow: 0 1px 0 rgba(0,0,0,.5);
&:hover {