From bd3448cf78c34f2215d7d29dc082119459ccbf92 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Sep 2011 20:17:34 -0700 Subject: [PATCH 1/2] make input prepend styles look a bit better --- bootstrap-1.3.0.css | 16 +++++++++------- bootstrap-1.3.0.min.css | 4 ++-- docs/index.html | 2 +- lib/forms.less | 14 ++++++++------ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 966ce6d2ee..1324cca444 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.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 Sep 11 19:59:57 PDT 2011 + * Date: Sun Sep 11 20:16:57 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). @@ -1015,20 +1015,22 @@ textarea[readonly] { border-radius: 0 3px 3px 0; } .input-prepend .add-on, .input-append .add-on { - background: #f5f5f5; + position: relative; + z-index: 2; float: left; display: block; width: auto; min-width: 16px; + height: 18px; padding: 4px 4px 4px 5px; - color: #bfbfbf; + margin-right: -1px; font-weight: normal; line-height: 18px; - height: 18px; + color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #fff; + background-color: #f5f5f5; 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; @@ -1052,8 +1054,8 @@ textarea[readonly] { -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; + margin-right: 0; + margin-left: -1px; } .inputs-list { margin: 0 0 5px; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index 37c3f2a239..a7ed280d93 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -166,11 +166,11 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .inline-inputs input.small{width:90px;} .inline-inputs span{padding:0 2px 0 1px;} .input-prepend input,.input-append input{-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 .add-on,.input-append .add-on{position:relative;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #fff;background-color:#f5f5f5;border:1px solid #ccc;-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{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;} +.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;margin-right:0;margin-left:-1px;} .inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;} .inputs-list label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;} .inputs-list label small{font-size:11px;font-weight:normal;} diff --git a/docs/index.html b/docs/index.html index f9bcb784e4..7b9a07909b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -633,10 +633,10 @@

Inline labels

-

Call attention to or flag any phrase in your body text.

<span class="label">

+

Call attention to or flag any phrase in your body text.

Label anything

diff --git a/lib/forms.less b/lib/forms.less index c867511936..5b19129f82 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -327,20 +327,22 @@ textarea[readonly] { .border-radius(0 3px 3px 0); } .add-on { - background: #f5f5f5; + position: relative; + z-index: 2; float: left; display: block; width: auto; min-width: 16px; + height: 18px; padding: 4px 4px 4px 5px; - color: @grayLight; + margin-right: -1px; font-weight: normal; line-height: 18px; - height: 18px; + color: @grayLight; text-align: center; text-shadow: 0 1px 0 #fff; + background-color: #f5f5f5; border: 1px solid #ccc; - border-right-width: 0; .border-radius(3px 0 0 3px); } .active { @@ -360,8 +362,8 @@ textarea[readonly] { } .add-on { .border-radius(0 3px 3px 0); - border-right-width: 1px; - border-left-width: 0; + margin-right: 0; + margin-left: -1px; } } From af2223efb1048c9b9dd53f7f2481646d731d0da7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Sep 2011 20:38:45 -0700 Subject: [PATCH 2/2] remove border from dropdowns in topbar to prevent it from looking 1px off --- bootstrap-1.3.0.css | 3 ++- bootstrap-1.3.0.min.css | 2 +- lib/patterns.less | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 1324cca444..23eda7a422 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.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 Sep 11 20:16:57 PDT 2011 + * Date: Sun Sep 11 20:23:28 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). @@ -1435,6 +1435,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { .topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu { right: 0; + border: 0; } .topbar div > ul a.menu:hover, .nav a.menu:hover, diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index a7ed280d93..5c2693dc00 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -228,7 +228,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul>li,.nav>li{display:block;float:left;} .topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#fff;text-decoration:none;} .topbar div>ul .active>a,.nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} -.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .menu-dropdown,.nav.secondary-nav .menu-dropdown,.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;} +.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .menu-dropdown,.nav.secondary-nav .menu-dropdown,.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;border:0;} .topbar div>ul a.menu:hover,.nav a.menu:hover,.topbar div>ul li.open .menu,.nav li.open .menu,.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} .topbar div>ul .menu-dropdown,.nav .menu-dropdown,.topbar div>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar div>ul .menu-dropdown a.menu,.nav .menu-dropdown a.menu,.topbar div>ul .dropdown-menu a.menu,.nav .dropdown-menu a.menu,.topbar div>ul .menu-dropdown .dropdown-toggle,.nav .menu-dropdown .dropdown-toggle,.topbar div>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#fff;}.topbar div>ul .menu-dropdown a.menu.open,.nav .menu-dropdown a.menu.open,.topbar div>ul .dropdown-menu a.menu.open,.nav .dropdown-menu a.menu.open,.topbar div>ul .menu-dropdown .dropdown-toggle.open,.nav .menu-dropdown .dropdown-toggle.open,.topbar div>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} .topbar div>ul .menu-dropdown li a,.nav .menu-dropdown li a,.topbar div>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#fff;} diff --git a/lib/patterns.less b/lib/patterns.less index 88f56ea597..e2ef83ce22 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -161,6 +161,7 @@ .menu-dropdown, .dropdown-menu { right: 0; + border: 0; } } // Dropdowns within the .nav