From 369cedd87c4447241ce2a73ed6c8414a4cd8bdf8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 19:31:01 -0600 Subject: [PATCH 01/14] update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row --- bootstrap.css | 4 ++-- bootstrap.min.css | 2 +- lib/forms.less | 2 +- lib/responsive.less | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 354f534b28..fbd909de30 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 Dec 21 18:38:56 CST 2011 + * Date: Wed Dec 21 19:30:30 CST 2011 */ html, body { margin: 0; @@ -2695,7 +2695,7 @@ a.thumbnail:hover { .row { margin-left: 0; } - [class*="span"] { + .row > [class*="span"] { float: none; display: block; width: auto; diff --git a/bootstrap.min.css b/bootstrap.min.css index 1fb1d4f32f..e6cf50d161 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -351,4 +351,4 @@ a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, .thumbnail>img{display:block;max-width:100%;} .thumbnail .caption{padding:9px;} .hidden{display:none;visibility:hidden;} -@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} +@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/lib/forms.less b/lib/forms.less index 64e77fdb4c..84fddd7d1f 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -93,7 +93,7 @@ input[type=file] { line-height: @baseLineHeight * 1.5; } -// Chrome on Linux needs background color +// Chrome on Linux and Mobile Safari need background-color select { background-color: @white; } diff --git a/lib/responsive.less b/lib/responsive.less index c74f6b98e0..d8b453d06d 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -60,7 +60,7 @@ margin-left: 0; } // Make all columns even - [class*="span"] { + .row > [class*="span"] { float: none; display: block; width: auto; From 690d3f4d1aeb97a76d22a4dfe056e33606e0bd94 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2011 19:32:14 -0600 Subject: [PATCH 02/14] remove inline input field CSS since that's not required as all inputs are inline-block anyway --- bootstrap.css | 17 +---------------- bootstrap.min.css | 4 ---- lib/forms.less | 21 --------------------- 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index fbd909de30..2ea7a8fbe3 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 Dec 21 19:30:30 CST 2011 + * Date: Wed Dec 21 19:31:39 CST 2011 */ html, body { margin: 0; @@ -904,21 +904,6 @@ textarea[readonly] { 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; -} .input-prepend, .input-append { overflow: hidden; } diff --git a/bootstrap.min.css b/bootstrap.min.css index e6cf50d161..f6587dd878 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -146,10 +146,6 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} .help-inline{*position:relative;*top:-5px;display:inline;padding-left: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;} .input-prepend,.input-append{overflow:hidden;}.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;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;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-color:#a9dba9;border-color:#46a546;} diff --git a/lib/forms.less b/lib/forms.less index 84fddd7d1f..99d6fcb59d 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -298,27 +298,6 @@ textarea[readonly] { -// INLINE FIELDS -// ------------- - -.inline-inputs { - color: @gray; - span, input { - display: inline-block; - } - input.mini { - width: 60px; - } - input.small { - width: 90px; - } - span { - padding: 0 2px 0 1px; - } -} - - - // INPUT GROUPS // ------------ From 058f47b33b3978bbb484e521e7fc14c6ebadc161 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 26 Dec 2011 17:25:25 -0600 Subject: [PATCH 03/14] clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color --- bootstrap.css | 106 ++-------------------------------------------- bootstrap.min.css | 11 +---- docs/index.html | 1 + lib/patterns.less | 103 ++------------------------------------------ 4 files changed, 8 insertions(+), 213 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 5e22415ddd..ff21bc836c 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: Mon Dec 26 16:47:02 CST 2011 + * Date: Mon Dec 26 17:12:29 CST 2011 */ html, body { margin: 0; @@ -1191,10 +1191,6 @@ table { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } -.navbar a { - color: #bfbfbf; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} .navbar .brand a:hover, .navbar ul .active > a { color: #ffffff; text-decoration: none; @@ -1300,7 +1296,9 @@ table { float: none; padding: 10px 10px 11px; line-height: 19px; + color: #bfbfbf; text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .nav a:hover { color: #ffffff; @@ -1368,104 +1366,6 @@ table { .topbar ul .dropdown-menu li a { padding: 4px 15px; } -.dropdown { - position: relative; -} -.dropdown-toggle:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - filter: alpha(opacity=30); - -moz-opacity: 0.3; - opacity: 0.3; - content: "↓"; -} -.dropdown:hover .dropdown-toggle:after { - filter: alpha(opacity=100); - -moz-opacity: 1; - opacity: 1; -} -.dropdown-menu { - position: absolute; - top: 40px; - z-index: 900; - float: left; - display: none; - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 6px 0; - margin-left: 0; - margin-right: 0; - background-color: #ffffff; - border-color: #999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; - zoom: 1; -} -.dropdown-menu li { - float: none; - display: block; - background-color: none; -} -.dropdown-menu .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid #ffffff; -} -.topbar .dropdown-menu a, .dropdown-menu a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #808080; - text-shadow: 0 1px 0 #ffffff; -} -.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { - color: #404040; - text-decoration: none; - background-color: #dddddd; - background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd)); - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -ms-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(top, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} .hero-unit { padding: 60px; margin-bottom: 30px; diff --git a/bootstrap.min.css b/bootstrap.min.css index aa277ddb8c..711e8a37ee 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -173,7 +173,6 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .striped-table tbody tr:nth-child(odd) td,.striped-table tbody tr:nth-child(odd) th{background-color:#f9f9f9;} .navbar{overflow:visible;} .navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.navbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;} @@ -185,7 +184,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .navbar-fixed{position:fixed;top:0;right:0;left:0;z-index:10000;} .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;} -.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;} +.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;color:#bfbfbf;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.nav a:hover{color:#ffffff;text-decoration:none;} .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav .divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;} @@ -195,14 +194,6 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .nav .dropdown-menu .active a{color:#ffffff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .topbar ul .dropdown-menu li a{padding:4px 15px;} -.dropdown{position:relative;} -.dropdown-toggle:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"↓";} -.dropdown:hover .dropdown-toggle:after{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;} -.dropdown-menu{position:absolute;top:40px;z-index:900;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:6px 0;margin-left:0;margin-right:0;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;zoom:1;}.dropdown-menu li{float:none;display:block;background-color:none;} -.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} -.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{color:#404040;text-decoration:none;background-color:#dddddd;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} -.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} -.dropdown.open .dropdown-menu{display:block;} .hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{padding-top:17px;margin-top:17px;border-top:1px solid #eee;} diff --git a/docs/index.html b/docs/index.html index 0d340fa1ab..735fe7ae73 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,6 +41,7 @@
  • Javascript plugins
  • Using LESS
    • + Button diff --git a/lib/patterns.less b/lib/patterns.less index 44c427adf5..25934d80a8 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -24,11 +24,6 @@ } // Text and links .navbar { - // Links get text-shadow - a { - color: @grayLight; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - } // Hover and active states .brand a:hover, ul .active > a { @@ -146,7 +141,9 @@ float: none; padding: 10px 10px 11px; line-height: 19px; + color: @grayLight; text-decoration: none; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); &:hover { color: @white; text-decoration: none; @@ -213,101 +210,6 @@ padding: 4px 15px; } -// Dropdown Menus -// Use the .menu class on any
  • element within the topbar or ul.tabs and you'll get some superfancy dropdowns -.dropdown { - position: relative; -} -// The link that is clicked to toggle the dropdown -.dropdown-toggle:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid @white; - .opacity(30); - content: "↓"; -} -.dropdown:hover .dropdown-toggle:after { - .opacity(100); -} -// The dropdown menu (ul) -.dropdown-menu { - position: absolute; - top: 40px; - z-index: 900; - float: left; - display: none; // None by default, but block on "open" of the menu - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 6px 0; - margin-left: 0; // override default ul styles - margin-right: 0; - background-color: @white; - border-color: #999; - border-color: rgba(0,0,0,.2); - border-style: solid; - border-width: 0 1px 1px; - .border-radius(0 0 6px 6px); - .box-shadow(0 2px 4px rgba(0,0,0,.2)); - .background-clip(padding-box); - zoom: 1; // do we need this? - - // Unfloat any li's to make them stack - li { - float: none; - display: block; - background-color: none; - } - // Dividers (basically an hr) within the dropdown - .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid @white; - } -} - -.topbar .dropdown-menu, .dropdown-menu { - // Links within the dropdown menu - a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: @gray; - text-shadow: 0 1px 0 @white; - // Hover state - &:hover { - color: @grayDark; - text-decoration: none; - #gradient > .vertical(#eeeeee, #dddddd); - @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025); - .box-shadow(@shadow); - } - } -} - -// Open state for the dropdown -.dropdown.open { - .dropdown-toggle { - color: @white; - background: #ccc; - background: rgba(0,0,0,.3); - } - .dropdown-menu { - display: block; - } -} - @@ -493,6 +395,7 @@ input[type=submit].btn { float: left; margin-left: -1px; .border-radius(0); + // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match &:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; From 324246e4f964437a2dfa7efbd2d1b6b039369b2c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 12:39:39 -0600 Subject: [PATCH 04/14] remove negative margin from .brand in docs, update navbar to support buttons up thurr --- bootstrap.css | 5 ++++- bootstrap.min.css | 1 + docs/assets/css/docs.css | 1 + lib/patterns.less | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index ff21bc836c..105c10de39 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: Mon Dec 26 17:12:29 CST 2011 + * Date: Tue Dec 27 12:39:01 CST 2011 */ html, body { margin: 0; @@ -1215,6 +1215,9 @@ table { color: #ffffff; background-color: transparent; } +.navbar .btn { + margin-top: 5px; +} .navbar-search { position: relative; float: left; diff --git a/bootstrap.min.css b/bootstrap.min.css index 711e8a37ee..048414c782 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -176,6 +176,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .navbar .brand a:hover,.navbar ul .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} .navbar p{margin:0;line-height:40px;}.navbar p a:hover{color:#ffffff;background-color:transparent;} +.navbar .btn{margin-top:5px;} .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background-color:#444;background-color:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;} .navbar-search .search-query::-webkit-input-placeholder{color:#e6e6e6;} .navbar-search .search-query:hover{color:#ffffff;background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b3c4649419..c2c92a2519 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -22,6 +22,7 @@ body { body > .navbar-fixed .brand { padding-right: 0; padding-left: 0; + margin-left: 20px; float: right; font-weight: bold; color: #000; diff --git a/lib/patterns.less b/lib/patterns.less index 25934d80a8..d48d65e48b 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -52,6 +52,10 @@ background-color: transparent; } } + // Buttons in navbar + .btn { + margin-top: 5px; // make buttons vertically centered in navbar + } } // Navbar search From b9adae14fc9fa64134aebb57655dd93e0a7e6ad6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 12:40:30 -0600 Subject: [PATCH 05/14] remove button from topbar for testing --- docs/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 735fe7ae73..0d340fa1ab 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,7 +41,6 @@
  • Javascript plugins
  • Using LESS
    • - Button From 5801c4d766205c6f1579b9c45e733df5dba3b1fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 13:51:50 -0600 Subject: [PATCH 06/14] capitalize Less in makefile, add print less file (not yet compiled) --- Makefile | 2 +- lib/print.less | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 lib/print.less diff --git a/Makefile b/Makefile index 3d24eb1c52..5eee74f2e5 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ watch: echo "Watching less files..."; \ watchr -e "watch('lib/.*\.less') { system 'make' }"; \ else \ - echo "You must have the watchr installed in order to watch Bootstrap less files."; \ + echo "You must have the watchr installed in order to watch Bootstrap Less files."; \ echo "You can install it by running: gem install watchr"; \ fi diff --git a/lib/print.less b/lib/print.less new file mode 100644 index 0000000000..b45d016fdd --- /dev/null +++ b/lib/print.less @@ -0,0 +1,18 @@ +/*! + * Bootstrap @VERSION for Print + * + * Copyright 2011 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Date: @DATE + */ + + +// HIDE UNECESSARY COMPONENTS +// -------------------------- + +.navbar-fixed { + display: none; +} \ No newline at end of file From fec02f50455c87f0e01fe74b1fb2e3cd032ade09 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 15:40:58 -0600 Subject: [PATCH 07/14] clean up some css for github issues: input prepend z-index, modals revamped for responsive --- bootstrap.css | 18 ++++++++++++------ bootstrap.min.css | 8 ++++---- docs/base-css.html | 2 +- docs/components.html | 2 +- lib/forms.less | 4 +--- lib/modals.less | 3 ++- lib/responsive.less | 12 ++++++++++++ 7 files changed, 33 insertions(+), 16 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 105c10de39..95dde47e84 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 Dec 27 12:39:01 CST 2011 + * Date: Tue Dec 27 15:23:07 CST 2011 */ html, body { margin: 0; @@ -602,6 +602,7 @@ select, input[type=file] { } select { background-color: #ffffff; + vertical-align: middle; } select[multiple] { height: inherit; @@ -904,17 +905,12 @@ textarea[readonly] { display: block; max-width: 600px; } -.input-prepend, .input-append { - overflow: hidden; -} .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; - z-index: 2; float: left; display: block; width: auto; @@ -2574,6 +2570,16 @@ a.thumbnail:hover { .horizontal-form .form-actions { padding-left: 0; } + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + } + .modal .close { + padding: 10px; + } } @media (max-width: 768px) { .container { diff --git a/bootstrap.min.css b/bootstrap.min.css index 048414c782..aff1c43c2a 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -100,7 +100,7 @@ input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto; 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;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} -select{background-color:#ffffff;} +select{background-color:#ffffff;vertical-align:middle;} select[multiple]{height:inherit;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} textarea{height:auto;} @@ -146,8 +146,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;} .help-block{display:block;max-width:600px;} -.input-prepend,.input-append{overflow:hidden;}.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;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;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 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{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;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-color:#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;} @@ -339,4 +339,4 @@ a.thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, .thumbnail>img{display:block;max-width:100%;} .thumbnail .caption{padding:9px;} .hidden{display:none;visibility:hidden;} -@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} +@media (max-width: 480px){.modal{width:auto;margin:0;} .horizontal-form .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .horizontal-form .controls{margin-left:0;} .horizontal-form .control-list{padding-top:0;} .horizontal-form .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal .close{padding:10px;}}@media (max-width: 768px){.container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;} .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .nav,.nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .nav>li{float:none;display:none;} .nav>li>a{float:none;background-color:#222;} .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar ul .active>a{background-color:transparent;} .nav>.active a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"↓";} .nav>.active a:hover{background-color:rgba(255, 255, 255, 0.05);}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}} diff --git a/docs/base-css.html b/docs/base-css.html index dad42381de..99fb9bd1a6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -894,7 +894,7 @@ Form states @ - Here's some help text +

    Here's some help text

    diff --git a/docs/components.html b/docs/components.html index c6a349ff49..fbfa9fb31e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -716,7 +716,7 @@

    Get the javascript »

    -
    +
    diff --git a/lib/forms.less b/lib/forms.less index 99d6fcb59d..9d96e8f33c 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -96,6 +96,7 @@ input[type=file] { // Chrome on Linux and Mobile Safari need background-color select { background-color: @white; + vertical-align: middle; } // Make multiple select elements height not fixed @@ -304,13 +305,10 @@ textarea[readonly] { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { - overflow: hidden; input { .border-radius(0 3px 3px 0); } .add-on { - position: relative; - z-index: 2; float: left; display: block; width: auto; diff --git a/lib/modals.less b/lib/modals.less index 53d6cd4089..4d2b92cbcd 100644 --- a/lib/modals.less +++ b/lib/modals.less @@ -13,7 +13,8 @@ &.fade { opacity: 0; } } -.modal-backdrop, .modal-backdrop.fade.in { +.modal-backdrop, +.modal-backdrop.fade.in { .opacity(80); } diff --git a/lib/responsive.less b/lib/responsive.less index d8b453d06d..fe2b7cd49a 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -43,6 +43,18 @@ .horizontal-form .form-actions { padding-left: 0; } + + // Modals + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + .close { + padding: 10px; + } + } } From 3426877c894b858d89e68c72bc300cd4f670c40f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 15:51:36 -0600 Subject: [PATCH 08/14] add ie7 inline block mixin and add ability to center pagination --- bootstrap.css | 11 +++++++++-- bootstrap.min.css | 3 ++- lib/mixins.less | 6 ++++++ lib/pagination.less | 8 +++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 95dde47e84..51341e9023 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 Dec 27 15:23:07 CST 2011 + * Date: Tue Dec 27 15:49:07 CST 2011 */ html, body { margin: 0; @@ -2211,7 +2211,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { margin: 18px 0; } .pagination ul { - float: left; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; margin: 0; border: 1px solid #ddd; border: 1px solid rgba(0, 0, 0, 0.15); @@ -2247,6 +2251,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .pagination .next a { border: 0; } +.pagination.centered { + text-align: center; +} .modal-backdrop { position: fixed; top: 0; diff --git a/bootstrap.min.css b/bootstrap.min.css index aff1c43c2a..4c794c9e74 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -292,12 +292,13 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#bfbfbf;} .breadcrumb .active a{color:#404040;} -.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination{height:36px;margin:18px 0;}.pagination ul{display:inline-block;*display:inline;*zoom:1;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} .pagination li{display:inline;} .pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;} .pagination a:hover,.pagination .active a{background-color:#c7eefe;} .pagination .disabled a,.pagination .disabled a:hover{color:#bfbfbf;background-color:transparent;} .pagination .next a{border:0;} +.pagination.centered{text-align:center;} .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:10000;background-color:#000000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} .modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} diff --git a/lib/mixins.less b/lib/mixins.less index e8b5cdd2f5..58df9298a5 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -25,6 +25,12 @@ margin-right: auto; } +// IE7 inline-block +.ie7-inline-block() { + *display: inline; /* IE7 inline-block hack */ + *zoom: 1; +} + // Sizing shortcuts .size(@height: 5px, @width: 5px) { width: @width; diff --git a/lib/pagination.less b/lib/pagination.less index d82a0bbd07..f630511689 100644 --- a/lib/pagination.less +++ b/lib/pagination.less @@ -5,7 +5,8 @@ height: @baseLineHeight * 2; margin: @baseLineHeight 0; ul { - float: left; + display: inline-block; + .ie7-inline-block(); margin: 0; border: 1px solid #ddd; border: 1px solid rgba(0,0,0,.15); @@ -37,4 +38,9 @@ .next a { border: 0; } + + // Centered + &.centered { + text-align: center; + } } From 46d2ad5e221646807fb2bd71881860462988008e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:08:07 -0600 Subject: [PATCH 09/14] allow select with size attr to not have fixed height --- bootstrap.css | 4 ++-- bootstrap.min.css | 2 +- lib/forms.less | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 51341e9023..a1fcc1df62 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 Dec 27 15:49:07 CST 2011 + * Date: Tue Dec 27 16:07:55 CST 2011 */ html, body { margin: 0; @@ -604,7 +604,7 @@ select { background-color: #ffffff; vertical-align: middle; } -select[multiple] { +select[multiple], select[size] { height: inherit; } input[type=image] { diff --git a/bootstrap.min.css b/bootstrap.min.css index 4c794c9e74..0be96084b2 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -101,7 +101,7 @@ input[type=file]{padding:initial;line-height:initial;border:initial;background-c input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} select{background-color:#ffffff;vertical-align:middle;} -select[multiple]{height:inherit;} +select[multiple],select[size]{height:inherit;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} textarea{height:auto;} input,textarea{-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);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} diff --git a/lib/forms.less b/lib/forms.less index 9d96e8f33c..e9c392c763 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -100,7 +100,8 @@ select { } // Make multiple select elements height not fixed -select[multiple] { +select[multiple], +select[size] { height: inherit; } From e78d5f8ff33009e4c4ab57496913b43ff1e369dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:25:22 -0600 Subject: [PATCH 10/14] fix tables for rowspan --- bootstrap.css | 2 +- docs/base-css.html | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index a1fcc1df62..2b870bfce4 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 Dec 27 16:07:55 CST 2011 + * Date: Tue Dec 27 16:25:12 CST 2011 */ html, body { margin: 0; diff --git a/docs/base-css.html b/docs/base-css.html index 99fb9bd1a6..13cbeedbc2 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -646,25 +646,24 @@ 1 Some One - English + HTML 2 Joe Sixpack - English + Javascript 3 Joe Sixpack - English 3 Stu Dent - Code + CSS From 550879cf666ec6445d1918604cb71c7202a52999 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 16:50:27 -0600 Subject: [PATCH 11/14] fix quotes in font-family usage --- lib/mixins.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mixins.less b/lib/mixins.less index 58df9298a5..83a3a31f92 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -54,13 +54,13 @@ #font { #family { .serif() { - font-family: "Georgia", Times New Roman, Times, serif; + font-family: Georgia, "Times New Roman", Times, serif; } .sans-serif() { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .monospace() { - font-family: "Menlo", Monaco, Courier New, monospace; + font-family: Menlo, Monaco, Courier New, monospace; } } .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { From 53c6dbff0d6dd781df421f07acdd9e98719b41bf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 17:04:55 -0600 Subject: [PATCH 12/14] add appended input example to docs, fix help-text wrapping issue by clearing float --- bootstrap.css | 24 ++++++++++++++++++------ bootstrap.min.css | 7 ++++--- docs/base-css.html | 10 ++++++++++ lib/forms.less | 1 + lib/tables.less | 6 +----- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 2b870bfce4..e83f46258c 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 Dec 27 16:25:12 CST 2011 + * Date: Tue Dec 27 17:02:48 CST 2011 */ html, body { margin: 0; @@ -491,7 +491,7 @@ address { } code, pre { padding: 0 3px 2px; - font-family: "Menlo", Monaco, Courier New, monospace; + font-family: Menlo, Monaco, Courier New, monospace; font-size: 12px; color: #404040; -webkit-border-radius: 3px; @@ -905,6 +905,21 @@ textarea[readonly] { display: block; max-width: 600px; } +.input-prepend, .input-append { + zoom: 1; +} +.input-prepend:before, +.input-append:before, +.input-prepend:after, +.input-append:after { + display: table; + *display: inline; + content: ""; + zoom: 1; +} +.input-prepend:after, .input-append:after { + clear: both; +} .input-prepend input, .input-append input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -985,7 +1000,7 @@ th, td { padding: 8px; line-height: 18px; text-align: left; - border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; } th { font-weight: bold; @@ -994,9 +1009,6 @@ th { td { vertical-align: top; } -tbody tr:last-child th, tbody tr:last-child td { - border-bottom: 0; -} .condensed-table th, .condensed-table td { padding: 4px 5px; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 0be96084b2..e2d7fccaa1 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -87,7 +87,7 @@ blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}bloc blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} address{display:block;margin-bottom:18px;line-height:18px;} -code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Courier New, monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:1px 3px;background-color:#fee9cc;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;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;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} pre code{padding:0;background-color:transparent;} @@ -146,6 +146,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;} .help-inline{*position:relative;*top:-5px;display:inline;padding-left:5px;} .help-block{display:block;max-width:600px;} +.input-prepend,.input-append{zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;*display:inline;content:"";zoom:1;} +.input-prepend:after,.input-append:after{clear:both;} .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{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;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-color:#a9dba9;border-color:#46a546;} @@ -160,10 +162,9 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .horizontal-form .control-list{padding-top:6px;} .horizontal-form .form-actions{padding-left:150px;} table{width:100%;margin-bottom:18px;} -th,td{padding:8px;line-height:18px;text-align:left;border-bottom:1px solid #ddd;} +th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} th{font-weight:bold;vertical-align:bottom;} td{vertical-align:top;} -tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;} .condensed-table th,.condensed-table td{padding:4px 5px;} .bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;} .bordered-table thead:first-child tr:first-child th:first-child,.bordered-table tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} diff --git a/docs/base-css.html b/docs/base-css.html index 13cbeedbc2..2bc6f49fbb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -896,6 +896,16 @@ Form states

    Here's some help text

    +
    + +
    +
    + + .00 +
    +

    Here's more help text

    +
    +
    diff --git a/lib/forms.less b/lib/forms.less index e9c392c763..5293d780ab 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -306,6 +306,7 @@ textarea[readonly] { // Allow us to put symbols and text within the input field for a cleaner look .input-prepend, .input-append { + .clearfix(); // Clear the float to prevent wrapping input { .border-radius(0 3px 3px 0); } diff --git a/lib/tables.less b/lib/tables.less index 524f959f06..1643705620 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -17,7 +17,7 @@ td { padding: 8px; line-height: @baseLineHeight; text-align: left; - border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; } th { font-weight: bold; @@ -26,10 +26,6 @@ th { td { vertical-align: top; } -tbody tr:last-child th, -tbody tr:last-child td { - border-bottom: 0; -} // CONDENSED TABLE W/ HALF PADDING From 704d713aadbfcd27e39226cb0d1b2243d52dde0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2011 17:39:34 -0600 Subject: [PATCH 13/14] border radius on large button toolbar --- bootstrap.css | 19 ++++++++++++++++++- bootstrap.min.css | 2 ++ lib/patterns.less | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/bootstrap.css b/bootstrap.css index e83f46258c..1d0a29b519 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 Dec 27 17:02:48 CST 2011 + * Date: Tue Dec 27 17:38:27 CST 2011 */ html, body { margin: 0; @@ -1628,6 +1628,23 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; } +.btn-group .btn.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.btn-group .btn.large:last-child { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} .btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active { z-index: 2; } diff --git a/bootstrap.min.css b/bootstrap.min.css index e2d7fccaa1..51e652bb95 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -221,6 +221,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .btn-group:after{clear:both;} .btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} .btn-group .btn:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} +.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} +.btn-group .btn.large:last-child{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} .close{float:right;font-size:20px;font-weight:bold;line-height:13.5px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;} .alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#eedc94;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} diff --git a/lib/patterns.less b/lib/patterns.less index d48d65e48b..7c9ee7e48f 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -417,6 +417,24 @@ input[type=submit].btn { -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; } + // Reset corners for large buttons + &.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; + } + &.large:last-child { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; + } } // On hover/focus/active, bring the proper btn to front .btn-group .btn:hover, From 553030ca7de8dac3c5180629ff84fa14173513ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Dec 2011 16:01:29 -0800 Subject: [PATCH 14/14] missing parantheses --- bootstrap.css | 2 +- lib/forms.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 1d0a29b519..8e2ce41f3b 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 Dec 27 17:38:27 CST 2011 + * Date: Fri Dec 30 16:01:05 PST 2011 */ html, body { margin: 0; diff --git a/lib/forms.less b/lib/forms.less index 5293d780ab..ededc772ed 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -220,7 +220,7 @@ textarea[readonly] { border-color: @borderColor; &:focus { border-color: darken(@borderColor, 10%); - .box-shadow(0 0 6px lighten(@borderColor, 20%); + .box-shadow(0 0 6px lighten(@borderColor, 20%)); } } // Give a small background color for input-prepend/-append