From 45c9b489eeaffd61429425c1c6b9b3e723bf0514 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Oct 2011 22:44:35 -0700 Subject: [PATCH] scope the label back to the form element --- bootstrap.css | 4 ++-- bootstrap.min.css | 2 +- lib/forms.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index bbbaac48a4..9dc882c9b8 100644 --- a/bootstrap.css +++ b/bootstrap.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: Mon Oct 3 22:36:24 PDT 2011 + * Date: Mon Oct 3 22:44:23 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). @@ -612,7 +612,7 @@ textarea { font-weight: normal; line-height: normal; } -label { +form label { padding-top: 6px; font-size: 13px; line-height: 18px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 45f4332940..18ef1134e5 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -109,7 +109,7 @@ fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padd 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 label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} form .input{margin-left:150px;} input[type=checkbox],input[type=radio]{cursor:pointer;} input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} diff --git a/lib/forms.less b/lib/forms.less index 7c9cc7c623..058d32832f 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -40,7 +40,7 @@ textarea { } // Float labels left -label { +form label { padding-top: 6px; font-size: @basefont; line-height: @baseline;