resolve conflicts

1 files changed, 10 insertions, 10 deletions

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index adb382e0f..c324bee3e 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:49:39 PDT 2011
+ * Date: Fri Sep  2 00:52:12 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).
@@ -1349,7 +1349,14 @@ a.menu:after, .dropdown-toggle:after {
   display: block;
   background-color: none;
 }
-.menu-dropdown a, .dropdown-menu a {
+.menu-dropdown .divider, .dropdown-menu .divider {
+  height: 1px;
+  margin: 5px 0;
+  overflow: hidden;
+  background-color: #eee;
+  border-bottom: 1px solid #fff;
+}
+.topbar .dropdown-menu a, .dropdown-menu a {
   display: block;
   padding: 4px 15px;
   clear: both;
@@ -1358,7 +1365,7 @@ a.menu:after, .dropdown-toggle:after {
   color: #808080;
   text-shadow: 0 1px 0 #fff;
 }
-.menu-dropdown a:hover, .dropdown-menu a:hover {
+.topbar .dropdown-menu a:hover, .dropdown-menu a:hover {
   background-color: #dddddd;
   background-repeat: repeat-x;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));
@@ -1374,13 +1381,6 @@ a.menu:after, .dropdown-toggle:after {
   -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
   box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
 }
-.menu-dropdown .divider, .dropdown-menu .divider {
-  height: 1px;
-  margin: 5px 0;
-  overflow: hidden;
-  background-color: #eee;
-  border-bottom: 1px solid #fff;
-}
 .open .menu,
 .dropdown.open .menu,
 .open .dropdown-toggle,