github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3

Browse Source 
Conflicts:
	css.html
This commit is contained in:
Mark Otto
2013-07-26 15:08:45 -07:00
parent 444973e54d 2e7593a40d
commit 1cf0a07f17
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
less/forms.less
View File

@@ -421,13 +421,8 @@ select {
// --------------------------------------------------
// Horizontal forms are built on grid classes.
.form-horizontal {
.row + .row {
margin-top: 15px;
}
.control-label {
.form-horizontal .control-label {
padding-top: 6px;
}
}
// Only right align form labels here when the columns stop stacking