From: Mark Otto <markotto@twitter.com>
Date: Fri, 17 Aug 2012 18:23:39 +0000 (-0700)
Subject: run make on previous commit's merge
X-Git-Tag: v2.1.0~2^2~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51b43acf2005993f7d9a0b5ac8abbad72d7a2dc1;p=thirdparty%2Fbootstrap.git

run make on previous commit's merge
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 27b4f6e6c8..f1c4afbbbd 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2049,7 +2049,8 @@ table .span24 {
 .nav > .active > a > [class^="icon-"],
 .nav > .active > a > [class*=" icon-"],
 .dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"].dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
 .dropdown-menu > .active > a > [class*=" icon-"] {
   background-image: url("../img/glyphicons-halflings-white.png");
 }