mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
move clearfix logic back onto clearfix class for ie7
This commit is contained in:
parent
68f89d109f
commit
39aca918d0
3 changed files with 14 additions and 20 deletions
27
bootstrap-1.3.0.css
vendored
27
bootstrap-1.3.0.css
vendored
|
@ -6,7 +6,7 @@
|
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||
* Date: Thu Sep 15 22:27:27 PDT 2011
|
||||
* Date: Thu Sep 15 22:36:03 PDT 2011
|
||||
*/
|
||||
/* Reset.less
|
||||
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
|
||||
|
@ -603,6 +603,16 @@ fieldset legend {
|
|||
}
|
||||
form .clearfix {
|
||||
margin-bottom: 18px;
|
||||
zoom: 1;
|
||||
}
|
||||
form .clearfix:before, form .clearfix:after {
|
||||
display: table;
|
||||
content: "";
|
||||
zoom: 1;
|
||||
*display: inline;
|
||||
}
|
||||
form .clearfix:after {
|
||||
clear: both;
|
||||
}
|
||||
label,
|
||||
input,
|
||||
|
@ -942,21 +952,6 @@ textarea[readonly] {
|
|||
.inline-inputs span {
|
||||
padding: 0 2px 0 1px;
|
||||
}
|
||||
.input-prepend, .input-append {
|
||||
zoom: 1;
|
||||
}
|
||||
.input-prepend:before,
|
||||
.input-append:before,
|
||||
.input-prepend:after,
|
||||
.input-append:after {
|
||||
display: table;
|
||||
content: "";
|
||||
zoom: 1;
|
||||
*display: inline;
|
||||
}
|
||||
.input-prepend:after, .input-append:after {
|
||||
clear: both;
|
||||
}
|
||||
.input-prepend input, .input-append input {
|
||||
-webkit-border-radius: 0 3px 3px 0;
|
||||
-moz-border-radius: 0 3px 3px 0;
|
||||
|
|
5
bootstrap-1.3.0.min.css
vendored
5
bootstrap-1.3.0.min.css
vendored
|
@ -107,7 +107,8 @@ code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
|
|||
pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
|
||||
form{margin-bottom:18px;}
|
||||
fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;}
|
||||
form .clearfix{margin-bottom:18px;}
|
||||
form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;*display:inline;}
|
||||
form .clearfix:after{clear:both;}
|
||||
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
|
||||
label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
|
||||
form .input{margin-left:150px;}
|
||||
|
@ -159,8 +160,6 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
|
|||
.inline-inputs input.mini{width:60px;}
|
||||
.inline-inputs input.small{width:90px;}
|
||||
.inline-inputs span{padding:0 2px 0 1px;}
|
||||
.input-prepend,.input-append{zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";zoom:1;*display:inline;}
|
||||
.input-prepend:after,.input-append:after{clear:both;}
|
||||
.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
|
||||
.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
|
||||
.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;}
|
||||
|
|
|
@ -28,6 +28,7 @@ fieldset {
|
|||
// Parent element that clears floats and wraps labels and fields together
|
||||
form .clearfix {
|
||||
margin-bottom: @baseline;
|
||||
.clearfix()
|
||||
}
|
||||
|
||||
// Set font for forms
|
||||
|
@ -325,7 +326,6 @@ textarea[readonly] {
|
|||
// Allow us to put symbols and text within the input field for a cleaner look
|
||||
.input-prepend,
|
||||
.input-append {
|
||||
.clearfix();
|
||||
input {
|
||||
.border-radius(0 3px 3px 0);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue