From b8511568637dfa4decb3f0475436a3dfa637a57d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:26:45 -0800 Subject: [PATCH 1/4] change form fields back to inline-block to allow for inline-help text in default form markup --- bootstrap.css | 4 ++-- bootstrap.min.css | 2 +- docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- lib/forms.less | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 0166a32015..39add86960 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 Jan 25 11:21:22 PST 2012 + * Date: Wed Jan 25 11:24:56 PST 2012 */ article, aside, @@ -497,7 +497,7 @@ input, textarea, select, .uneditable-input { - display: block; + display: inline-block; width: 210px; height: 18px; padding: 4px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 438305f715..20614ea732 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -94,7 +94,7 @@ fieldset{padding:0;margin:0;border:0;} legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;} label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;} label{display:block;margin-bottom:5px;color:#333333;} -input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;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;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .uneditable-textarea{width:auto;height:auto;} input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;} input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} diff --git a/docs/base-css.html b/docs/base-css.html index 1a9c4e15ab..057c98b859 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -899,7 +899,7 @@
- + Associated help text! diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 4263bead3b..4daa98309d 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -835,7 +835,7 @@
- + Associated help text! diff --git a/lib/forms.less b/lib/forms.less index 178c210181..70a065bdb6 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -52,7 +52,7 @@ input, textarea, select, .uneditable-input { - display: block; + display: inline-block; width: 210px; height: @baseLineHeight; padding: 4px; From a4b8cc2a9c8c7f16c4a93e64d2a187d839bfbb40 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:30:30 -0800 Subject: [PATCH 2/4] darken active state on subnav with scrollspy added --- docs/assets/css/docs.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 0fe480ecb3..600894f386 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -132,6 +132,7 @@ section { .subnav { width: 100%; height: 36px; + overflow: hidden; background-color: #eeeeee; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ @@ -167,13 +168,10 @@ section { color: #333; } .subnav .nav .active a { - background-color: #eee; + background-color: #e5e5e5; } .subnav .nav li:first-child a { border-left: 0; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; } .subnav .nav li:last-child a { border-right: 0; From 58d08a2db3e2ed1b789a5290ced2f0327c9c163b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:35:08 -0800 Subject: [PATCH 3/4] enable support for form states on select elements --- bootstrap.css | 14 +++++++------- bootstrap.min.css | 6 +++--- docs/base-css.html | 13 +++++++++++++ docs/templates/pages/base-css.mustache | 13 +++++++++++++ lib/forms.less | 1 + 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 730167f51f..4bffde24d1 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 Jan 25 11:27:15 PST 2012 + * Date: Wed Jan 25 11:31:57 PST 2012 */ article, aside, @@ -715,11 +715,11 @@ textarea[readonly] { .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } -.control-group.warning input, .control-group.warning textarea { +.control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; border-color: #c09853; } -.control-group.warning input:focus, .control-group.warning textarea:focus { +.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; -webkit-box-shadow: 0 0 6px #dbc59e; -moz-box-shadow: 0 0 6px #dbc59e; @@ -733,11 +733,11 @@ textarea[readonly] { .control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; } -.control-group.error input, .control-group.error textarea { +.control-group.error input, .control-group.error select, .control-group.error textarea { color: #b94a48; border-color: #b94a48; } -.control-group.error input:focus, .control-group.error textarea:focus { +.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #953b39; -webkit-box-shadow: 0 0 6px #d59392; -moz-box-shadow: 0 0 6px #d59392; @@ -751,11 +751,11 @@ textarea[readonly] { .control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } -.control-group.success input, .control-group.success textarea { +.control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; border-color: #468847; } -.control-group.success input:focus, .control-group.success textarea:focus { +.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; -webkit-box-shadow: 0 0 6px #7aba7b; -moz-box-shadow: 0 0 6px #7aba7b; diff --git a/bootstrap.min.css b/bootstrap.min.css index 20614ea732..c800de5e00 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -145,13 +145,13 @@ select.span11{width:870px;} select.span12{width:950px;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} -.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} -.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} +.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} -.control-group.success input,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} +.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} diff --git a/docs/base-css.html b/docs/base-css.html index a8a87da42a..1e9a3d942e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1066,6 +1066,19 @@ Woohoo!
+
+ +
+ + Woohoo! +
+
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 4daa98309d..913eea31ab 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1002,6 +1002,19 @@ {{_i}}Woohoo!{{/i}}
+
+ +
+ + {{_i}}Woohoo!{{/i}} +
+
diff --git a/lib/forms.less b/lib/forms.less index 70a065bdb6..3b35a172c7 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -283,6 +283,7 @@ textarea[readonly] { } // Style inputs accordingly input, + select, textarea { color: @textColor; border-color: @borderColor; From 06017b26ca5a9c835edb9d42188431fa30c7e499 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jan 2012 11:47:36 -0800 Subject: [PATCH 4/4] fix bottom visual bug on carousel images --- bootstrap.css | 6 +++++- bootstrap.min.css | 1 + lib/carousel.less | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index 4bffde24d1..7a538c7176 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 Jan 25 11:31:57 PST 2012 + * Date: Wed Jan 25 11:47:25 PST 2012 */ article, aside, @@ -2924,6 +2924,10 @@ a.thumbnail:hover { -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } +.carousel .item > img { + display: block; + line-height: 1; +} .carousel .active, .carousel .next, .carousel .prev { display: block; } diff --git a/bootstrap.min.css b/bootstrap.min.css index c800de5e00..87ea670e09 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -524,6 +524,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel{position:relative;line-height:1;} .carousel-inner{overflow:hidden;width:100%;position:relative;} .carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} +.carousel .item>img{display:block;line-height:1;} .carousel .active,.carousel .next,.carousel .prev{display:block;} .carousel .active{left:0;} .carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} diff --git a/lib/carousel.less b/lib/carousel.less index b0e95bfe93..254a9f60c7 100644 --- a/lib/carousel.less +++ b/lib/carousel.less @@ -20,6 +20,12 @@ .transition(.6s ease-in-out left); } + // Account for jankitude on images + .item > img { + display: block; + line-height: 1; + } + .active, .next, .prev { display: block; }