From 2c790304393cce3ba7db3b3d5bc9385b1986b838 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 8 Jan 2012 14:33:14 -0800
Subject: [PATCH] fix navbar styles for .brand
---
bootstrap.css | 8 ++++----
bootstrap.min.css | 4 ++--
docs/javascript.html | 24 ++++++++++++------------
lib/navbar.less | 7 +++----
4 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/bootstrap.css b/bootstrap.css
index 1fc88441ab..d040f329b8 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 13:30:08 PST 2012
+ * Date: Sun Jan 8 14:33:06 PST 2012
*/
html, body {
margin: 0;
@@ -1604,11 +1604,9 @@ i {
-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 .brand:hover, .navbar .nav .active > a {
+.navbar .brand:hover {
color: #ffffff;
text-decoration: none;
- background-color: #333333;
- background-color: rgba(255, 255, 255, 0.05);
}
.navbar .brand {
float: left;
@@ -1731,6 +1729,8 @@ i {
text-decoration: none;
}
.navbar .nav .active > a {
+ color: #ffffff;
+ text-decoration: none;
background-color: #222;
background-color: rgba(0, 0, 0, 0.5);
}
diff --git a/bootstrap.min.css b/bootstrap.min.css
index a776da8886..89e61a0b64 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -315,7 +315,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.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;}
.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 .brand:hover,.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#333333;background-color:rgba(255, 255, 255, 0.05);}
+.navbar .brand:hover{color:#ffffff;text-decoration:none;}
.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;}
@@ -332,7 +332,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.navbar .nav>li{display:block;float:left;}
.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
-.navbar .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
+.navbar .nav .active>a{color:#ffffff;text-decoration:none;background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
.navbar .vertical-divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
.navbar .dropdown-menu{top:42px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.1);position:absolute;top:-7px;left:12px;}
diff --git a/docs/javascript.html b/docs/javascript.html
index 256c366662..a63350c3d9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -64,57 +64,57 @@
</div>
<div class="row">
<div class="span3">
- <h3><a href="#transition">Transitions</a> <small class="muted">*</small></h3>
+ <h3><a href="./javascript.html#transition">Transitions</a> <small class="muted">*</small></h3>
<p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alert messages.</p>
<p class="muted"><strong>*</strong> Required for animation in plugins</p>
</div>
<div class="span3">
- <h3><a href="#modal">Modals</a></h3>
+ <h3><a href="./javascript.html#modal">Modals</a></h3>
<p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
</div>
<div class="span3">
- <h3><a href="#dropdown">Dropdowns</a></h3>
+ <h3><a href="./javascript.html#dropdown">Dropdowns</a></h3>
<p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
</div>
<div class="span3">
- <h3><a href="#scrollspy">Scrollspy</a></h3>
+ <h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3>
<p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span3">
- <h3><a href="#tab">Togglable tabs</a></h3>
+ <h3><a href="./javascript.html#tab">Togglable tabs</a></h3>
<p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p>
</div>
<div class="span3">
- <h3><a href="#twipsy">Twipsy tooltips</a></h3>
+ <h3><a href="./javascript.html#twipsy">Twipsy tooltips</a></h3>
<p>A new take on the jQuery Tipsy plugin, Twipsy uses CSS3 animations, data attributes for titles, and the new event API in jQuery 1.7.</p>
</div>
<div class="span3">
- <h3><a href="#popover">Popovers</a> <small class="muted">*</small></h3>
+ <h3><a href="./javascript.html#popover">Popovers</a> <small class="muted">*</small></h3>
<p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
<p class="muted"><strong>*</strong> Requires <a href="#twipsy">Twipsy</a> to be included</p>
</div>
<div class="span3">
- <h3><a href="#alert">Alert messages</a></h3>
+ <h3><a href="./javascript.html#alert">Alert messages</a></h3>
<p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span3">
- <h3><a href="#button">Buttons</a></h3>
+ <h3><a href="./javascript.html#button">Buttons</a></h3>
<p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
</div>
<div class="span3">
- <h3><a href="#button">Collapse</a></h3>
+ <h3><a href="./javascript.html#collapse">Collapse</a></h3>
<p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
</div>
<div class="span3">
- <h3><a href="#button">Carousel</a></h3>
+ <h3><a href="./javascript.html#carousel">Carousel</a></h3>
<p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
</div>
<div class="span3">
- <h3><a href="#button">Typeahead</a></h3>
+ <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
<p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
</div>
</div> <!-- /row -->
diff --git a/lib/navbar.less b/lib/navbar.less
index dbad9dcd86..82f9f7d2e4 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -20,12 +20,9 @@
// Text and links
.navbar {
// Hover and active states
- .brand:hover,
- .nav .active > a {
+ .brand:hover {
color: @white;
text-decoration: none;
- background-color: @navBarBgStart;
- background-color: rgba(255,255,255,.05);
}
// Website or project name
.brand {
@@ -166,6 +163,8 @@
// Active nav items
.navbar .nav .active > a {
+ color: @white;
+ text-decoration: none;
background-color: #222;
background-color: rgba(0,0,0,.5);
}
--
GitLab