From 6ad0559e0f23b668f5458a41a4d6d92df9a1304b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Oct 2011 22:26:14 -0700 Subject: [PATCH] remove redundant styles from inline forms --- bootstrap.css | 50 +---------------------------------------------- bootstrap.min.css | 14 +------------ lib/forms.less | 9 --------- 3 files changed, 2 insertions(+), 71 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 7c97e933a5..0966119d33 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: Tue Oct 11 23:12:13 PDT 2011 + * Date: Wed Oct 19 22:26: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). @@ -929,15 +929,6 @@ textarea[readonly] { .inline-inputs { color: #808080; } -.inline-inputs span, .inline-inputs input { - display: inline-block; -} -.inline-inputs input.mini { - width: 60px; -} -.inline-inputs input.small { - width: 90px; -} .inline-inputs span { padding: 0 2px 0 1px; } @@ -1669,45 +1660,6 @@ a.menu:after, .dropdown-toggle:after { border-bottom-color: transparent; cursor: default; } -.tabbable { - margin-bottom: 18px; -} -.tabbable .tabs { - margin-bottom: 0; - border-bottom: 0; -} -.tabbable .tab-content { - padding: 19px; - border: 1px solid #ddd; -} -.tabbable.tabs-bottom .tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabbable.tabs-bottom .tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabbable.tabs-bottom .tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; -} -.tabbable.tabs-bottom .tabs > .active > a, .tabbable.tabs-bottom .tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} -.tabbable.tabs-left .tabs { - float: left; -} -.tabbable.tabs-left .tabs > li { - float: none; -} -.tabbable.tabs-right .tabs { - float: right; -} -.tabbable.tabs-right .tabs > li { - float: none; -} .tabs .menu-dropdown, .tabs .dropdown-menu { top: 35px; border-width: 1px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 5e92c71438..c799ce4338 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -163,10 +163,7 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .help-inline,.help-block{font-size:13px;line-height:18px;color:#bfbfbf;} .help-inline{padding-left:5px;*position:relative;*top:-5px;} .help-block{display:block;max-width:600px;} -.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input{display:inline-block;} -.inline-inputs input.mini{width:60px;} -.inline-inputs input.small{width:90px;} -.inline-inputs span{padding:0 2px 0 1px;} +.inline-inputs{color:#808080;}.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{position:relative;background:#f5f5f5;border:1px solid #ccc;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 #ffffff;-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;} @@ -267,15 +264,6 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} .tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} .tabs .active>a,.tabs .active>a:hover{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} -.tabbable{margin-bottom:18px;}.tabbable .tabs{margin-bottom:0;border-bottom:0;} -.tabbable .tab-content{padding:19px;border:1px solid #ddd;} -.tabbable.tabs-bottom .tabs>li{margin-top:-1px;margin-bottom:0;} -.tabbable.tabs-bottom .tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabbable.tabs-bottom .tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} -.tabbable.tabs-bottom .tabs>.active>a,.tabbable.tabs-bottom .tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} -.tabbable.tabs-left .tabs{float:left;} -.tabbable.tabs-left .tabs>li{float:none;} -.tabbable.tabs-right .tabs{float:right;} -.tabbable.tabs-right .tabs>li{float:none;} .tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} .tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} diff --git a/lib/forms.less b/lib/forms.less index 82da41aabf..2075ffd659 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -331,15 +331,6 @@ textarea[readonly] { // Inline Fields (input fields that appear as inline objects .inline-inputs { color: @gray; - span, input { - display: inline-block; - } - input.mini { - width: 60px; - } - input.small { - width: 90px; - } span { padding: 0 2px 0 1px; }