diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 5244c6f137cea33a61bd3a4505e01342277784b7..05e4da01f747880e9a5d97d7ef491dbecd3843ba 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.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 Aug 21 18:07:44 PDT 2011 + * Date: Sun Aug 21 18:14:49 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). @@ -1114,11 +1114,6 @@ div.topbar { } div.topbar .fill { background: #222; - position: absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; background-color: #222222; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 9dcfcc970a0fcb341a8c2f6b493c7f6f9c30a469..14a1a176eed3bddbb24068277aa3f49d2868867b 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -154,7 +154,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}div.topbar .fill{background:#222;position:absolute;top:0;left:0;bottom:0;right:0;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);-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);} +div.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}div.topbar .fill{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);-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);} div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3{position:relative;}div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2f2f096ca6fd32f3ad64d3d485f652c145368dfd..bae49064a73dca5f3b761e13be00c808ce7bdbab 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -221,11 +221,11 @@ div.topbar-wrapper { div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; - padding-left: 20px; - padding-right: 20px; } div.topbar-wrapper div.topbar .fill { + padding-left: 20px; + padding-right: 20px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/docs/index.html b/docs/index.html index a9351d8610cc81b4d9819b4a6b6b4dd28587837e..b9fffce971765f16814c3185eeb1cddc0c7776a9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,22 +32,23 @@ <body onload="prettyPrint();"> <div class="topbar"> - <div class="fill"></div> - <div class="container"> - <h3><a href="#">Bootstrap</a></h3> - <ul> - <li class="active"><a href="#masthead">Overview</a></li> - <li><a href="#about">About</a></li> - <li><a href="#grid-system">Grid</a></li> - <li><a href="#layouts">Layouts</a></li> - <li><a href="#typography">Typography</a></li> - <li><a href="#tables">Tables</a></li> - <li><a href="#forms">Forms</a></li> - <li><a href="#navigation">Navigation</a></li> - <li><a href="#alerts">Alerts</a></li> - <li><a href="#popovers">Popovers</a></li> - <li><a href="#less">Less</a></li> - </ul> + <div class="fill"> + <div class="container"> + <h3><a href="#">Bootstrap</a></h3> + <ul> + <li class="active"><a href="#masthead">Overview</a></li> + <li><a href="#about">About</a></li> + <li><a href="#grid-system">Grid</a></li> + <li><a href="#layouts">Layouts</a></li> + <li><a href="#typography">Typography</a></li> + <li><a href="#tables">Tables</a></li> + <li><a href="#forms">Forms</a></li> + <li><a href="#navigation">Navigation</a></li> + <li><a href="#alerts">Alerts</a></li> + <li><a href="#popovers">Popovers</a></li> + <li><a href="#less">Less</a></li> + </ul> + </div> </div> </div> @@ -881,29 +882,30 @@ <h2>Fixed topbar</h2> <div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar"> - <div class="fill"></div> - <div class="container fixed"> - <h3><a href="#">Project Name</a></h3> - <ul> - <li class="active"><a href="#">Home</a></li> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> - </ul> - <form action=""> - <input type="text" placeholder="Search" /> - </form> - <ul class="nav secondary-nav"> - <li class="menu"> - <a href="#" class="menu">Dropdown</a> - <ul class="menu-dropdown"> - <li><a href="#">Secondary link</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Another link</a></li> - </ul> - </li> - </ul> + <div class="fill"> + <div class="container fixed"> + <h3><a href="#">Project Name</a></h3> + <ul> + <li class="active"><a href="#">Home</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + </ul> + <form action=""> + <input type="text" placeholder="Search" /> + </form> + <ul class="nav secondary-nav"> + <li class="menu"> + <a href="#" class="menu">Dropdown</a> + <ul class="menu-dropdown"> + <li><a href="#">Secondary link</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Another link</a></li> + </ul> + </li> + </ul> + </div> </div> </div> </div> <!-- topbar-wrapper --> diff --git a/lib/patterns.less b/lib/patterns.less index 056d468f588958765c2cc048aa46833030c6cc20..d49393e21993e345ff07be64f51ed7fb066f6ba5 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -19,11 +19,6 @@ div.topbar { // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present .fill { background:#222; - position:absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; #gradient > .vertical(#333, #222); @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); .box-shadow(@shadow);