From 0f7ba78fc54406ed8475ed02c0e0ec5e507b7f00 Mon Sep 17 00:00:00 2001 From: Mehdi Lahmam B Date: Wed, 16 Nov 2011 20:18:06 +0100 Subject: [PATCH] Minor cleaning to forms fonts styles + rebuild --- bootstrap.css | 8 +++----- bootstrap.min.css | 4 ++-- lib/forms.less | 8 +++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index e9f2a3822857..de31dcc56201 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: Wed Nov 16 00:28:10 PST 2011 + * Date: Wed Nov 16 20:16:33 CET 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). @@ -606,7 +606,8 @@ textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; - line-height: normal; + line-height: 18px; + color: #808080; } label { padding-top: 6px; @@ -631,9 +632,6 @@ select, 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; diff --git a/bootstrap.min.css b/bootstrap.min.css index 39b2661d1171..0cdd31c260b0 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -107,11 +107,11 @@ 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;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;} 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,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;} 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;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} select{padding:initial;} input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;} input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} diff --git a/lib/forms.less b/lib/forms.less index 87fcc3d1a332..e66463600dbc 100755 --- a/lib/forms.less +++ b/lib/forms.less @@ -36,7 +36,8 @@ label, input, select, textarea { - #font > .sans-serif(normal,13px,normal); + #font > .sans-serif(normal,@basefont,@baseline); + color: @gray; } // Float labels left @@ -70,9 +71,6 @@ select, width: 210px; height: @baseline; padding: 4px; - font-size: @basefont; - line-height: @baseline; - color: @gray; border: 1px solid #ccc; .border-radius(3px); } @@ -476,4 +474,4 @@ textarea[readonly] { margin-left: -20px; padding-left: 20px; } -} +} \ No newline at end of file