From f630615d2603337843a1b8766496cb313e60fb6c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:27:19 -0700 Subject: [PATCH] remove tags from form selectors --- bootstrap-1.0.0.css | 70 ++++++++++++++++++++--------------------- bootstrap-1.0.0.min.css | 44 +++++++++++++------------- lib/forms.less | 28 ++++++++--------- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index c446aef1b6..edcb06b88d 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.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 Aug 21 20:16:18 PDT 2011 + * Date: Sun Aug 21 20:27:08 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). @@ -651,7 +651,7 @@ form fieldset legend { line-height: 1; color: #404040; } -form div.clearfix { +form .clearfix { margin-bottom: 18px; } form label, @@ -735,7 +735,7 @@ form input[type=text]:focus, form input[type=password]:focus, form textarea:focu -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); } -form div.error { +form .error { background: #fae5e3; padding: 10px 0; margin: -10px 0 10px; @@ -743,22 +743,22 @@ form div.error { -moz-border-radius: 4px; border-radius: 4px; } -form div.error > label, form div.error span.help-inline, form div.error span.help-block { +form .error > label, form .error span.help-inline, form .error span.help-block { color: #9d261d; } -form div.error input[type=text], form div.error input[type=password], form div.error textarea { +form .error input[type=text], form .error input[type=password], form .error textarea { border-color: #c87872; -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); } -form div.error input[type=text]:focus, form div.error input[type=password]:focus, form div.error textarea:focus { +form .error input[type=text]:focus, form .error input[type=password]:focus, form .error textarea:focus { border-color: #b9554d; -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); } -form div.error div.input-prepend span.add-on, form div.error div.input-append span.add-on { +form .error .input-prepend span.add-on, form .error .input-append span.add-on { background: #f4c8c5; border-color: #c87872; color: #b9554d; @@ -809,7 +809,7 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { -moz-box-shadow: none; box-shadow: none; } -div.actions { +.actions { background: #f5f5f5; margin-top: 18px; margin-bottom: 18px; @@ -819,13 +819,13 @@ div.actions { -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; } -div.actions div.secondary-action { +.actions .secondary-action { float: right; } -div.actions div.secondary-action a { +.actions .secondary-action a { line-height: 30px; } -div.actions div.secondary-action a:hover { +.actions .secondary-action a:hover { text-decoration: underline; } .help-inline, .help-block { @@ -840,27 +840,27 @@ div.actions div.secondary-action a:hover { display: block; max-width: 600px; } -div.inline-inputs { +.inline-inputs { color: #808080; } -div.inline-inputs span, div.inline-inputs input[type=text] { +.inline-inputs span, .inline-inputs input[type=text] { display: inline-block; } -div.inline-inputs input.mini { +.inline-inputs input.mini { width: 60px; } -div.inline-inputs input.small { +.inline-inputs input.small { width: 90px; } -div.inline-inputs span { +.inline-inputs span { padding: 0 2px 0 1px; } -div.input-prepend input[type=text], div.input-append input[type=text] { +.input-prepend input[type=text], .input-append input[type=text] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -div.input-prepend .add-on, div.input-append .add-on { +.input-prepend .add-on, .input-append .add-on { background: #f5f5f5; float: left; display: block; @@ -879,33 +879,33 @@ div.input-prepend .add-on, div.input-append .add-on { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -div.input-prepend .active, div.input-append .active { +.input-prepend .active, .input-append .active { background: #a9dba9; border-color: #46a546; } -div.input-append input[type=text] { +.input-append input[type=text] { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -div.input-append .add-on { +.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; } -ul.inputs-list { +.inputs-list { margin: 0 0 5px; width: 100%; } -ul.inputs-list li { +.inputs-list li { display: block; padding: 0; width: 100%; } -ul.inputs-list li label { +.inputs-list li label { display: block; float: none; width: auto; @@ -914,22 +914,22 @@ ul.inputs-list li label { text-align: left; white-space: normal; } -ul.inputs-list li label strong { +.inputs-list li label strong { color: #808080; } -ul.inputs-list li label small { +.inputs-list li label small { font-size: 12px; font-weight: normal; } -ul.inputs-list li ul.inputs-list { +.inputs-list li ul.inputs-list { margin-left: 25px; margin-bottom: 10px; padding-top: 0; } -ul.inputs-list li:first-child { +.inputs-list li:first-child { padding-top: 5px; } -ul.inputs-list input[type=radio], ul.inputs-list input[type=checkbox] { +.inputs-list input[type=radio], .inputs-list input[type=checkbox] { margin-bottom: 0; } form.form-stacked { @@ -950,23 +950,23 @@ form.form-stacked label { line-height: 20px; padding-top: 0; } -form.form-stacked div.clearfix { +form.form-stacked .clearfix { margin-bottom: 9px; } -form.form-stacked div.clearfix div.input { +form.form-stacked .clearfix div.input { margin-left: 0; } -form.form-stacked ul.inputs-list { +form.form-stacked .inputs-list { margin-bottom: 0; } -form.form-stacked ul.inputs-list li { +form.form-stacked .inputs-list li { padding-top: 0; } -form.form-stacked ul.inputs-list li label { +form.form-stacked .inputs-list li label { font-weight: normal; padding-top: 0; } -form.form-stacked div.actions { +form.form-stacked .actions { margin-left: -20px; padding-left: 20px; } diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 1fce25139f..273fb6eb9e 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -83,7 +83,7 @@ code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospa code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:17px;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-wrap;} form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;} -form div.clearfix{margin-bottom:18px;} +form .clearfix{margin-bottom:18px;} form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} form div.input{margin-left:150px;} @@ -96,9 +96,9 @@ form :-moz-placeholder{color:#bfbfbf;} form ::-webkit-input-placeholder{color:#bfbfbf;} form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} -form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;} -form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} -form div.error div.input-prepend span.add-on,form div.error div.input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} +form .error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form .error>label,form .error span.help-inline,form .error span.help-block{color:#9d261d;} +form .error input[type=text],form .error input[type=password],form .error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form .error input[type=text]:focus,form .error input[type=password]:focus,form .error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} +form .error .input-prepend span.add-on,form .error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;} form .input-small,form input.small,form textarea.small,form select.small{width:90px;} form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;} @@ -107,30 +107,30 @@ form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{wid form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;} form textarea.xxlarge{overflow-y:scroll;} form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}div.actions div.secondary-action{float:right;}div.actions div.secondary-action a{line-height:30px;}div.actions div.secondary-action a:hover{text-decoration:underline;} +.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} .help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;} .help-inline{padding-left:5px;} .help-block{display:block;max-width:600px;} -div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text]{display:inline-block;} -div.inline-inputs input.mini{width:60px;} -div.inline-inputs input.small{width:90px;} -div.inline-inputs span{padding:0 2px 0 1px;} -div.input-prepend input[type=text],div.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -div.input-prepend .add-on,div.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;} -div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;} -div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -div.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;} -ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;} -ul.inputs-list li label small{font-size:12px;font-weight:normal;} -ul.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} -ul.inputs-list li:first-child{padding-top:5px;} -ul.inputs-list input[type=radio],ul.inputs-list input[type=checkbox]{margin-bottom:0;} +.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input[type=text]{display:inline-block;} +.inline-inputs input.mini{width:60px;} +.inline-inputs input.small{width:90px;} +.inline-inputs span{padding:0 2px 0 1px;} +.input-prepend input[type=text],.input-append input[type=text]{-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 .active,.input-append .active{background:#a9dba9;border-color:#46a546;} +.input-append input[type=text]{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;} +.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;} +.inputs-list li label small{font-size:12px;font-weight:normal;} +.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} +.inputs-list li:first-child{padding-top:5px;} +.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;} form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;} form.form-stacked legend{margin-left:0;} form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} -form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;} -form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;} -form.form-stacked div.actions{margin-left:-20px;padding-left:20px;} +form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;} +form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} +form.form-stacked .actions{margin-left:-20px;padding-left:20px;} table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} .zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} diff --git a/lib/forms.less b/lib/forms.less index f958693fc4..3a847ae841 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -23,7 +23,7 @@ form { } // Parent element that clears floats and wraps labels and fields together - div.clearfix { + .clearfix { margin-bottom: @baseline; } @@ -112,7 +112,7 @@ form { } // Error styles - div.error { + .error { background: lighten(@red, 57%); padding: 10px 0; margin: -10px 0 10px; @@ -133,8 +133,8 @@ form { .box-shadow(0 0 6px rgba(171,41,32,.5)); } } - div.input-prepend, - div.input-append { + .input-prepend, + .input-append { span.add-on { background: lighten(@red, 50%); border-color: @error-text; @@ -177,14 +177,14 @@ form { } // Actions (the buttons) -div.actions { +.actions { background: #f5f5f5; margin-top: @baseline; margin-bottom: @baseline; padding: (@baseline - 1) 20px @baseline 150px; border-top: 1px solid #ddd; .border-radius(0 0 3px 3px); - div.secondary-action { + .secondary-action { float: right; a { line-height: 30px; @@ -213,7 +213,7 @@ div.actions { } // Inline Fields (input fields that appear as inline objects -div.inline-inputs { +.inline-inputs { color: @gray; span, input[type=text] { display: inline-block; @@ -230,8 +230,8 @@ div.inline-inputs { } // Allow us to put symbols and text within the input field for a cleaner look -div.input-prepend, -div.input-append { +.input-prepend, +.input-append { input[type=text] { .border-radius(0 3px 3px 0); } @@ -257,7 +257,7 @@ div.input-append { border-color: @green; } } -div.input-append { +.input-append { input[type=text] { float: left; .border-radius(3px 0 0 3px); @@ -270,7 +270,7 @@ div.input-append { } // Stacked options for forms (radio buttons or checkboxes) -ul.inputs-list { +.inputs-list { margin: 0 0 5px; width: 100%; li { @@ -326,13 +326,13 @@ form.form-stacked { line-height: 20px; padding-top: 0; } - div.clearfix { + .clearfix { margin-bottom: @baseline / 2; div.input { margin-left: 0; } } - ul.inputs-list { + .inputs-list { margin-bottom: 0; li { padding-top: 0; @@ -342,7 +342,7 @@ form.form-stacked { } } } - div.actions { + .actions { margin-left: -20px; padding-left: 20px; }