From: Jacob Thornton Date: Sun, 21 Aug 2011 18:57:25 +0000 (-0700) Subject: add # to color X-Git-Tag: v1.1.0~14^2~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=612e5c3c9e9c4ead98ebbb52db8cebeee082289b;p=thirdparty%2Fbootstrap.git add # to color --- diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 8451a98b5f..6c5f00a87c 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.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: Sun Aug 21 11:56:11 PDT 2011 + * Date: Sun Aug 21 11:57:22 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). @@ -1249,7 +1249,7 @@ div.topbar ul li.menu a.menu:after { opacity: 0.5; } div.topbar ul li.menu.open a.menu, div.topbar ul li.menu.open a:hover { - background-color: 444; + background-color: #444; background-color: rgba(255, 255, 255, 0.1); color: #fff; } diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 66864a4458..6a579ec675 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -166,7 +166,7 @@ div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0 div.topbar ul.primary-nav li ul{left:0;} div.topbar ul.secondary-nav li ul{right:0;} div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:444;background-color:rgba(255, 255, 255, 0.1);color:#fff;} +div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} diff --git a/lib/patterns.less b/lib/patterns.less index 6106f3a3fa..5fffc309cb 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -154,7 +154,7 @@ div.topbar { &.open { a.menu, a:hover { - background-color: 444; + background-color: #444; background-color: rgba(255,255,255,.1); color: #fff; }