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

Merge branch 'master' into icon_paths

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
This commit is contained in:
Mark Otto
2014-05-22 23:01:42 -07:00
parent 91d51d3fba 10e9fef85c
commit d66b65ddde
39 changed files with 113 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/forms.less
+8 -3
View File
@@ -165,9 +165,11 @@ input[type="search"] {
}
// Special styles for iOS date input
// Special styles for iOS temporal inputs
//
// In Mobile Safari, date inputs require a pixel line-height that matches the
// In Mobile Safari, setting `display: block` on temporal inputs causes the
// text within the input to become vertically misaligned.
// As a workaround, we set a pixel line-height that matches the
// given height of the input. Since this fucks up everything else, we have to
// appropriately reset it for Internet Explorer and the size variations.
@@ -410,8 +412,11 @@ input[type="checkbox"],
display: inline-block;
margin-top: 0;
margin-bottom: 0;
padding-left: 0;
vertical-align: middle;
label {
padding-left: 0;
}
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {