From 411e32434095c9b6e9def4114d84df371e8e5d20 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 2 Sep 2011 00:58:07 -0700
Subject: [PATCH] fix dropdown bug, remove second topbar from docs now
---
bootstrap-1.2.0.css | 7 +++++--
bootstrap-1.2.0.min.css | 2 +-
docs/index.html | 41 -----------------------------------------
lib/patterns.less | 2 ++
4 files changed, 8 insertions(+), 44 deletions(-)
diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 7746a57d45..105de8a6d5 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.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: Fri Sep 2 00:54:51 PDT 2011
+ * Date: Fri Sep 2 00:57:14 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).
@@ -1224,7 +1224,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
margin-left: 10px;
margin-right: 0;
}
-.topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu {
+.topbar div > ul.secondary-nav .menu-dropdown,
+.nav.secondary-nav .menu-dropdown,
+.topbar div > ul.secondary-nav .dropdown-menu,
+.nav.secondary-nav .dropdown-menu {
right: 0;
}
.topbar div > ul a.menu:hover,
diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css
index d985f5104b..52e5733a03 100644
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@ -187,7 +187,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
.topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul>li,.nav>li{display:block;float:left;}
.topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#fff;text-decoration:none;}
.topbar div>ul .active a,.nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
-.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;}
+.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .menu-dropdown,.nav.secondary-nav .menu-dropdown,.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;}
.topbar div>ul a.menu:hover,.nav a.menu:hover,.topbar div>ul li.open .menu,.nav li.open .menu,.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);}
.topbar div>ul .menu-dropdown,.nav .menu-dropdown,.topbar div>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar div>ul .menu-dropdown a.menu,.nav .menu-dropdown a.menu,.topbar div>ul .dropdown-menu a.menu,.nav .dropdown-menu a.menu,.topbar div>ul .menu-dropdown .dropdown-toggle,.nav .menu-dropdown .dropdown-toggle,.topbar div>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#fff;}.topbar div>ul .menu-dropdown a.menu.open,.nav .menu-dropdown a.menu.open,.topbar div>ul .dropdown-menu a.menu.open,.nav .dropdown-menu a.menu.open,.topbar div>ul .menu-dropdown .dropdown-toggle.open,.nav .menu-dropdown .dropdown-toggle.open,.topbar div>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);}
.topbar div>ul .menu-dropdown li a,.nav .menu-dropdown li a,.topbar div>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;}
diff --git a/docs/index.html b/docs/index.html
index 50a3b5715f..e9686b90d1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -945,47 +945,6 @@
</div><!-- /topbar -->
</div><!-- /topbar-wrapper -->
-
- <div class="topbar-wrapper" style="z-index: 4;">
- <div class="topbar">
- <div class="fill">
- <div class="container">
- <h3><a href="#">Project Name</a></h3>
- <ul class="">
- <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>
- <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>
- <form action="">
- <input type="text" placeholder="Search" />
- </form>
- <ul class="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><!-- /topbar-inner -->
- </div><!-- /topbar -->
- </div><!-- /topbar-wrapper -->
-
-
<div class="row">
<div class="span5 columns">
<h4>What is it</h4>
diff --git a/lib/patterns.less b/lib/patterns.less
index 578b028266..a897b2f16c 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -143,6 +143,8 @@
float: right;
margin-left: 10px;
margin-right: 0;
+ // backwards compatibility
+ .menu-dropdown,
.dropdown-menu {
right: 0;
}
--
GitLab