mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

remove need for floats and IE hacks for input-prepend and input-append--boom

Browse Source
This commit is contained in:
Mark Otto
2012-03-11 22:58:14 -07:00
parent 0630cd62b3
commit 91eef351e4
5 changed files with 8 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+2 -26
View File
@@ -983,18 +983,6 @@ select:focus:required:invalid:focus {
.input-prepend,
.input-append {
margin-bottom: 5px;
*zoom: 1;
}
.input-prepend:before,
.input-append:before,
.input-prepend:after,
.input-append:after {
display: table;
content: "";
}
.input-prepend:after,
.input-append:after {
clear: both;
}
.input-prepend input,
.input-append input,
@@ -1021,8 +1009,7 @@ select:focus:required:invalid:focus {
}
.input-prepend .add-on,
.input-append .add-on {
float: left;
display: block;
display: inline-block;
width: auto;
min-width: 16px;
height: 18px;
@@ -1032,6 +1019,7 @@ select:focus:required:invalid:focus {
line-height: 18px;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
vertical-align: middle;
background-color: #eeeeee;
border: 1px solid #ccc;
-webkit-border-radius: 3px 0 0 3px;
@@ -1043,14 +1031,8 @@ select:focus:required:invalid:focus {
background-color: #a9dba9;
border-color: #46a546;
}
.input-prepend .add-on {
*margin-top: 1px;
/* IE6-7 */
}
.input-append input,
.input-append select .uneditable-input {
float: left;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
@@ -1066,12 +1048,6 @@ select:focus:required:invalid:focus {
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
.input-append input:first-child {
*margin-left: -160px;
}
.input-append input:first-child + .add-on {
*margin-left: -21px;
}
.search-query {
padding-left: 14px;
padding-right: 14px;