Skip to content

B
bootstrap
Commit b18e76f9 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

introduce .fill class to top-nav for overflow bug

parent 1d964172
Expand all Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 27 deletions
bootstrap-1.0.0.css
View file @ b18e76f9
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Aug 21 12:06:13 PDT 2011 * Date: Sun Aug 21 12:18:33 PDT 2011
*/ */
/* Reset.less /* 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). * 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).
...@@ -422,6 +422,7 @@ a:hover { ...@@ -422,6 +422,7 @@ a:hover {
background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -webkit-linear-gradient(#049cdb, #0064cd);
background-image: -o-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
background-image: linear-gradient(#049cdb, #0064cd); background-image: linear-gradient(#049cdb, #0064cd);
color: #fff; color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
...@@ -1092,7 +1093,21 @@ table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDow ...@@ -1092,7 +1093,21 @@ table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDow
* Repeatable UI elements outside the base styles provided from the scaffolding * Repeatable UI elements outside the base styles provided from the scaffolding
* ---------------------------------------------------------------------------- */ * ---------------------------------------------------------------------------- */
div.topbar { div.topbar {
height: 40px;
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 10000;
overflow: visible;
}
div.topbar .fill {
background: #222; background: #222;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
background-color: #222222; background-color: #222222;
background-repeat: repeat-x; background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
...@@ -1102,14 +1117,8 @@ div.topbar { ...@@ -1102,14 +1117,8 @@ div.topbar {
background-image: -webkit-linear-gradient(#333333, #222222); background-image: -webkit-linear-gradient(#333333, #222222);
background-image: -o-linear-gradient(#333333, #222222); background-image: -o-linear-gradient(#333333, #222222);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; -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); background-image: linear-gradient(#333333, #222222);
height: 40px;
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 10000;
overflow: visible;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -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); -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); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
...@@ -1124,6 +1133,9 @@ div.topbar a:hover, div.topbar ul li.active a { ...@@ -1124,6 +1133,9 @@ div.topbar a:hover, div.topbar ul li.active a {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
} }
div.topbar h3 {
position: relative;
}
div.topbar h3 a { div.topbar h3 a {
float: left; float: left;
display: block; display: block;
...@@ -1362,6 +1374,7 @@ div.alert-message { ...@@ -1362,6 +1374,7 @@ div.alert-message {
background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);
background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15));
background-color: #e6e6e6; background-color: #e6e6e6;
margin-bottom: 18px; margin-bottom: 18px;
......
bootstrap-1.0.0.min.css
View file @ b18e76f9
This diff is collapsed.
docs/assets/css/docs.css
View file @ b18e76f9
...@@ -223,6 +223,9 @@ div.topbar-wrapper div.topbar { ...@@ -223,6 +223,9 @@ div.topbar-wrapper div.topbar {
margin: 0 -20px; margin: 0 -20px;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
}
div.topbar-wrapper div.topbar .fill {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
......
docs/index.html
View file @ b18e76f9
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="topbar"> <div class="topbar">
<div class="fill"></div>
<div class="container"> <div class="container">
<h3><a href="#">Bootstrap</a></h3> <h3><a href="#">Bootstrap</a></h3>
<ul> <ul>
...@@ -879,6 +880,7 @@ ...@@ -879,6 +880,7 @@
<h2>Fixed topbar</h2> <h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar"> <div class="topbar">
<div class="fill"></div>
<div class="container fixed"> <div class="container fixed">
<h3><a href="#">Project Name</a></h3> <h3><a href="#">Project Name</a></h3>
<ul> <ul>
......
lib/patterns.less
View file @ b18e76f9
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
// Topbar for Branding and Nav // Topbar for Branding and Nav
div.topbar { div.topbar {
background:#222;
#gradient > .vertical(#333, #222);
height: 40px; height: 40px;
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -17,8 +15,19 @@ div.topbar { ...@@ -17,8 +15,19 @@ div.topbar {
right: 0; right: 0;
z-index: 10000; z-index: 10000;
overflow: visible; overflow: visible;
// 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); @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow); .box-shadow(@shadow);
}
// Links get text shadow // Links get text shadow
a { a {
...@@ -36,7 +45,9 @@ div.topbar { ...@@ -36,7 +45,9 @@ div.topbar {
} }
// Website name // Website name
h3 a { h3 {
position:relative;
a {
float: left; float: left;
display: block; display: block;
padding: 8px 20px 12px; padding: 8px 20px 12px;
...@@ -46,6 +57,7 @@ div.topbar { ...@@ -46,6 +57,7 @@ div.topbar {
font-weight: 200; font-weight: 200;
line-height: 1; line-height: 1;
} }
}
// Search Form // Search Form
form { form {
......
lib/preboot.less
View file @ b18e76f9
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
-ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+
// filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7
background-image: linear-gradient(left, @startColor, @endColor); // Le standard background-image: linear-gradient(left, @startColor, @endColor); // Le standard
} }
.vertical (@startColor: #555, @endColor: #333) { .vertical (@startColor: #555, @endColor: #333) {
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
-ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+
// filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7
background-image: linear-gradient(@startColor, @endColor); // The standard background-image: linear-gradient(@startColor, @endColor); // The standard
} }
.directional (@startColor: #555, @endColor: #333, @deg: 45deg) { .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment