From 40aba9ca1d1ab5e6288c2c1550e40c9263f5aa88 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 22 Aug 2011 21:51:17 -0700 Subject: [PATCH] append checkbox to password input #36 --- bootstrap-1.1.0.css | 9 ++++++--- bootstrap-1.1.0.min.css | 4 ++-- lib/forms.less | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index 2f4482da8d..58bd541235 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.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: Mon Aug 22 21:47:27 PDT 2011 + * Date: Mon Aug 22 21:51:03 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). @@ -910,7 +910,10 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { .inline-inputs span { padding: 0 2px 0 1px; } -.input-prepend input[type=text], .input-append input[type=text] { +.input-prepend input[type=text], +.input-append input[type=text], +.input-prepend input[type=password], +.input-append input[type=password] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -943,7 +946,7 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { /* IE6-7 */ } -.input-append input[type=text] { +.input-append input[type=text], .input-append input[type=password] { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 9e52f49b54..d9b1b3010c 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -117,11 +117,11 @@ form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{bac .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 input[type=text],.input-append input[type=text],.input-prepend input[type=password],.input-append input[type=password]{-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-prepend .add-on{*margin-top:1px;} -.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 input[type=text],.input-append input[type=password]{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;} diff --git a/lib/forms.less b/lib/forms.less index 4265f8e590..b38163f338 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -236,7 +236,8 @@ form { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { - input[type=text] { + input[type=text], + input[type=password] { .border-radius(0 3px 3px 0); } .add-on { @@ -269,7 +270,8 @@ form { } .input-append { - input[type=text] { + input[type=text], + input[type=password] { float: left; .border-radius(3px 0 0 3px); }