diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 966ce6d2ee..1324cca444 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -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: Sun Sep 11 19:59:57 PDT 2011 + * Date: Sun Sep 11 20:16:57 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). @@ -1015,20 +1015,22 @@ textarea[readonly] { border-radius: 0 3px 3px 0; } .input-prepend .add-on, .input-append .add-on { - background: #f5f5f5; + position: relative; + z-index: 2; float: left; display: block; width: auto; min-width: 16px; + height: 18px; padding: 4px 4px 4px 5px; - color: #bfbfbf; + margin-right: -1px; font-weight: normal; line-height: 18px; - height: 18px; + color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #fff; + background-color: #f5f5f5; border: 1px solid #ccc; - border-right-width: 0; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; @@ -1052,8 +1054,8 @@ textarea[readonly] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; - border-right-width: 1px; - border-left-width: 0; + margin-right: 0; + margin-left: -1px; } .inputs-list { margin: 0 0 5px; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index 37c3f2a239..a7ed280d93 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -166,11 +166,11 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .inline-inputs input.small{width:90px;} .inline-inputs span{padding:0 2px 0 1px;} .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{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .add-on,.input-append .add-on{position:relative;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 #fff;background-color:#f5f5f5;border:1px solid #ccc;-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;} .input-prepend .add-on{*margin-top:1px;} .input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;} +.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;margin-right:0;margin-left:-1px;} .inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;} .inputs-list label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;} .inputs-list label small{font-size:11px;font-weight:normal;} diff --git a/docs/index.html b/docs/index.html index f9bcb784e4..7b9a07909b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -633,10 +633,10 @@

Inline labels

-

Call attention to or flag any phrase in your body text.

<span class="label">

+

Call attention to or flag any phrase in your body text.

Label anything

diff --git a/lib/forms.less b/lib/forms.less index c867511936..5b19129f82 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -327,20 +327,22 @@ textarea[readonly] { .border-radius(0 3px 3px 0); } .add-on { - background: #f5f5f5; + position: relative; + z-index: 2; float: left; display: block; width: auto; min-width: 16px; + height: 18px; padding: 4px 4px 4px 5px; - color: @grayLight; + margin-right: -1px; font-weight: normal; line-height: 18px; - height: 18px; + color: @grayLight; text-align: center; text-shadow: 0 1px 0 #fff; + background-color: #f5f5f5; border: 1px solid #ccc; - border-right-width: 0; .border-radius(3px 0 0 3px); } .active { @@ -360,8 +362,8 @@ textarea[readonly] { } .add-on { .border-radius(0 3px 3px 0); - border-right-width: 1px; - border-left-width: 0; + margin-right: 0; + margin-left: -1px; } }