mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 00:59:51 +02:00
Code Issues Releases Wiki Activity

Merge branch 'pr/13320'

Browse Source 
Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-04-30 19:48:22 -07:00
parent 17f77a5070 108b7c390e
commit 4c3ef52fc1
10 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/css/bootstrap.css vendored
View File

@@ -2587,6 +2587,9 @@ select[multiple].input-lg {
.has-error .form-control-feedback {
color: #a94442;
}
.has-feedback label.sr-only ~ .form-control-feedback {
top: 0;
}
.form-control-static {
margin-bottom: 0;
}