From cb9be7bd0cde19b3b401d2dcdfb6162dd00b5ab5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 13:21:44 -0800 Subject: [PATCH] clean up dup css in responsive, fix navbar dropdown caret --- bootstrap.css | 18 +++++++----------- bootstrap.min.css | 6 +++--- docs/assets/css/docs.css | 2 +- docs/index.html | 5 +++-- lib/navs.less | 6 ++++-- lib/responsive.less | 16 +++++----------- lib/scaffolding.less | 10 ++++++++-- 7 files changed, 31 insertions(+), 32 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index f2ebd44c39..baafd0dd94 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: Sun Jan 8 12:40:18 PST 2012 + * Date: Sun Jan 8 13:21:31 PST 2012 */ html, body { margin: 0; @@ -1934,11 +1934,11 @@ i { -moz-border-radius: 4px; border-radius: 4px; } -.nav .dropdown-toggle .caret { +.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { border-top-color: #0088cc; margin-top: 6px; } -.nav .dropdown-toggle:hover .caret { +.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { border-top-color: #005580; } .nav .open .dropdown-toggle { @@ -3065,13 +3065,6 @@ a.thumbnail:hover { .navbar .nav:hover > li > a:hover { background-color: #333; } - .modal { - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } .horizontal-form .control-group > label { float: none; width: auto; @@ -3094,7 +3087,10 @@ a.thumbnail:hover { right: 20px; width: auto; } - .modal .close { + .modal.fade.in { + top: auto; + } + .modal-header .close { padding: 10px; } } diff --git a/bootstrap.min.css b/bootstrap.min.css index be19ce1540..17a2c107b1 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -370,8 +370,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou .pills.stacked>li:last-child>a{margin-bottom:1px;} .nav .dropdown-menu{top:33px;border-width:1px;} .pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.nav .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;} -.nav .dropdown-toggle:hover .caret{border-top-color:#005580;} +.tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;} +.tabs .dropdown-toggle:hover .caret,.pills .dropdown-toggle:hover .caret{border-top-color:#005580;} .nav .open .dropdown-toggle{background-color:#999;border-color:#999;} .nav .open .caret,.nav .open a:hover .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;} .tabs.stacked .open>a:hover{border-color:#999;} @@ -514,4 +514,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .progress.info .bar{background-color:#339bb9;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .hidden{display:none;visibility:hidden;} -@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .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;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .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:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .modal{width:auto;margin:0;}.modal.fade.in{top:auto;} .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){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@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){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .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;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .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:"↓";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .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.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@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/assets/css/docs.css b/docs/assets/css/docs.css index c359cf73ba..f370672037 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -163,7 +163,7 @@ body > .navbar-fixed .brand:hover { /* Marketing section of Overview -------------------------------------------------- */ .marketing .row { - margin-bottom: 18px; + margin-bottom: 9px; } .marketing h1 { margin: 36px 0 27px; diff --git a/docs/index.html b/docs/index.html index 231ed2066b..8f7963afd2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -127,6 +127,7 @@

Designed for everyone, everywhere.

+

Need reasons to love Bootstrap? Look no further.

@@ -153,7 +154,7 @@

Responsive design

-

With Bootstrap 2, we've gone fully responsive. Our components are flexible enough to scale according to whatever resolution or device you're using to provide a consistent experience, no matter what.

+

With Bootstrap 2, we've gone fully responsive. Our components are scale according to a range of resolutions and devices to provide a consistent experience, no matter what.

@@ -205,7 +206,7 @@

Get started in no time.

-

Built for any skill level, Bootstrap fits your workflow and development process.

+

Quickly start using Bootstrap within your workflow and development process.

diff --git a/lib/navs.less b/lib/navs.less index dee482aea2..65d459da93 100644 --- a/lib/navs.less +++ b/lib/navs.less @@ -182,11 +182,13 @@ .pills .dropdown-menu { .border-radius(4px); } -.nav .dropdown-toggle .caret { +.tabs .dropdown-toggle .caret, +.pills .dropdown-toggle .caret { border-top-color: @linkColor; margin-top: 6px; } -.nav .dropdown-toggle:hover .caret { +.tabs .dropdown-toggle:hover .caret, +.pills .dropdown-toggle:hover .caret { border-top-color: @linkColorHover; } .nav .open .dropdown-toggle { diff --git a/lib/responsive.less b/lib/responsive.less index e87b8495f4..5131aa625b 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -67,7 +67,6 @@ .opacity(100); content: "↓"; } - .nav:hover > li { display: block; } @@ -76,13 +75,6 @@ } } - // Resize modals - .modal { - width: auto; - margin: 0; - &.fade.in { top: auto; } - } - // Remove the horizontal form styles .horizontal-form .control-group > label { float: none; @@ -110,10 +102,12 @@ left: 20px; right: 20px; width: auto; - .close { - padding: 10px; - } + &.fade.in { top: auto; } } + .modal-header .close { + padding: 10px; + } + } diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 7432e849ba..a1f41ab66a 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -39,8 +39,14 @@ body { .sidebar-right { padding-right: @fluidSidebarWidth + 40; } // Float the sidebars accordingly -.sidebar-left .fluid-sidebar { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; } -.sidebar-right .fluid-sidebar { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; } +.sidebar-left .fluid-sidebar { + float: left; + margin-left: (@fluidSidebarWidth + 20) * -1; +} +.sidebar-right .fluid-sidebar { + float: right; + margin-right: (@fluidSidebarWidth + 20) * -1; +} // The main content area .fluid-content {