From 48c3c6f1b67b1f2a2f2ea499cef65bdfd27dc21d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 18:14:53 -0700 Subject: [PATCH] make topbar .fill wrap --- bootstrap-1.0.0.css | 7 +--- bootstrap-1.0.0.min.css | 2 +- docs/assets/css/docs.css | 4 +- docs/index.html | 80 ++++++++++++++++++++-------------------- lib/patterns.less | 5 --- 5 files changed, 45 insertions(+), 53 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 5244c6f137..05e4da01f7 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 9dcfcc970a..14a1a176ee 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 2f2f096ca6..bae49064a7 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 a9351d8610..b9fffce971 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,22 +32,23 @@
-
-
-

Bootstrap

- +
+
+

Bootstrap

+ +
@@ -881,29 +882,30 @@

Fixed topbar

-
-
-

Project Name

- -
- -
- +
+
+

Project Name

+ +
+ +
+ +
diff --git a/lib/patterns.less b/lib/patterns.less index 056d468f58..d49393e219 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);