mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	less/button-groups.less
This commit is contained in:
Mark Otto
2012-11-22 22:04:21 -08:00
parent fa1c130552 e0d0190803
commit 7e56e2265d
17 changed files with 46 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/navbar.less
+1 -1
View File
@@ -112,7 +112,7 @@
}
.input-append,
.input-prepend {
margin-top: 6px;
margin-top: 5px;
white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left
input {
margin-top: 0; // remove the margin on top since it's on the parent