diff options
| author | Mark Otto <[email protected]> | 2012-01-05 23:24:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-05 23:24:19 -0800 |
| commit | 5cb76037ae70ca26a923750ca9441b04d2fbd6a7 (patch) | |
| tree | ac7ed2db7638c3d6a47d2a209d83ce0df2924884 /lib | |
| parent | 7582520808ad6c3610831652d0d4d33ea4ebf15b (diff) | |
| download | bootstrap-5cb76037ae70ca26a923750ca9441b04d2fbd6a7.tar.xz bootstrap-5cb76037ae70ca26a923750ca9441b04d2fbd6a7.zip | |
fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/forms.less | 3 | ||||
| -rw-r--r-- | lib/navbar.less | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/forms.less b/lib/forms.less index ddd735cc4..938983536 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -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); } diff --git a/lib/navbar.less b/lib/navbar.less index 7e0b17d43..a96aa941c 100644 --- a/lib/navbar.less +++ b/lib/navbar.less @@ -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 { |