aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 21:10:17 -0800
committerMark Otto <[email protected]>2012-01-07 21:10:17 -0800
commitecffa038903412419163c7aed9299a7289ad14ad (patch)
treed4419b97fea7f59cd6a78e3cf5390c664e9242ed
parent95f47026cf55dc029d266e80bb4fab00b85af0e8 (diff)
downloadbootstrap-ecffa038903412419163c7aed9299a7289ad14ad.tar.xz
bootstrap-ecffa038903412419163c7aed9299a7289ad14ad.zip
nuke unused code, add to upgrading page
-rw-r--r--bootstrap.css34
-rw-r--r--docs/upgrading.html1
-rw-r--r--lib/navbar.less34
3 files changed, 2 insertions, 67 deletions
diff --git a/bootstrap.css b/bootstrap.css
index f16ce9e3d..6d9d78ebb 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: Sat Jan 7 20:56:31 PST 2012
+ * Date: Sat Jan 7 21:10:08 PST 2012
*/
html, body {
margin: 0;
@@ -1790,38 +1790,6 @@ i {
left: auto;
right: 13px;
}
-/* // Dropdowns within the .nav
- .dropdown-toggle:hover,
- .dropdown.open .dropdown-toggle {
- background: #444;
- background: rgba(255,255,255,.05);
- }
- .dropdown-menu {
- background-color: #333;
- .dropdown-toggle {
- color: @white;
- &.open {
- background: #444;
- background: rgba(255,255,255,.05);
- }
- }
- li a {
- padding: 4px 15px;
- color: #999;
- text-shadow: 0 1px 0 rgba(0,0,0,.5);
- &:hover {
- #gradient > .vertical(#292929,#191919);
- color: @white;
- }
- }
- .active a {
- color: @white;
- }
- .divider {
- background-color: #222;
- border-color: #444;
- }
- }*/
.nav {
margin-left: 0;
margin-bottom: 18px;
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f6070f846..916240794 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -111,6 +111,7 @@
<ul>
<li>Updated the <code>.dropdown-menu</code> to tighten up spacing</li>
<li>Now requires you to add a <code>&lt;span class="caret"&gt;&lt;/span&gt;</code> to show the dropdown arrow</li>
+ <li>The navbar (fixed topbar) has brand new dropdowns. Gone are the dark versions and in their place are the standard white ones with an additional caret at their tops for clarity of position.</li>
</ul>
</li>
<li>Navigation
diff --git a/lib/navbar.less b/lib/navbar.less
index b7f223141..8ee203307 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -241,37 +241,3 @@
right: 13px;
}
}
-
-
-/* // Dropdowns within the .nav
- .dropdown-toggle:hover,
- .dropdown.open .dropdown-toggle {
- background: #444;
- background: rgba(255,255,255,.05);
- }
- .dropdown-menu {
- background-color: #333;
- .dropdown-toggle {
- color: @white;
- &.open {
- background: #444;
- background: rgba(255,255,255,.05);
- }
- }
- li a {
- padding: 4px 15px;
- color: #999;
- text-shadow: 0 1px 0 rgba(0,0,0,.5);
- &:hover {
- #gradient > .vertical(#292929,#191919);
- color: @white;
- }
- }
- .active a {
- color: @white;
- }
- .divider {
- background-color: #222;
- border-color: #444;
- }
- }*/