Fix navbar dropdown color, label color

3 files changed, 22 insertions, 6 deletions

diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css
index acc1c213..d5adff48 100644
--- a/spacelab/bootstrap.css
+++ b/spacelab/bootstrap.css
@@ -3059,13 +3059,13 @@ a.thumbnail:hover {
   background-color: #393939;
 }
 .label-warning {
-  background-color: #ff7d00;
+  background-color: #ffb166;
 }
 .label-success {
-  background-color: #333333;
+  background-color: #59aa59;
 }
 .label-info {
-  background-color: #1b3650;
+  background-color: #2e5d89;
 }
 @-webkit-keyframes progress-bar-stripes {
   from {
@@ -3379,6 +3379,12 @@ a.thumbnail:hover {
   background-color: transparent;
   color: #4183c4;
 }
+.navbar .nav .open.dropdown .dropdown-toggle {
+  color: #333333;
+}
+.navbar .nav .open.dropdown .dropdown-toggle:hover {
+  color: #4183c4;
+}
 .navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
   border-top-color: #333333;
   opacity: 1;
diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css
index 2a4a3ffa..bd7e5e8e 100644
--- a/spacelab/bootstrap.min.css
+++ b/spacelab/bootstrap.min.css
@@ -567,9 +567,9 @@ a.thumbnail:hover{border-color:#4183c4;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .thumbnail .caption{padding:9px;}
 .label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 .label-important{background-color:#393939;}
-.label-warning{background-color:#ff7d00;}
-.label-success{background-color:#333333;}
-.label-info{background-color:#1b3650;}
+.label-warning{background-color:#ffb166;}
+.label-success{background-color:#59aa59;}
+.label-info{background-color:#2e5d89;}
 @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
 .progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
@@ -607,6 +607,7 @@ a.thumbnail:hover{border-color:#4183c4;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .navbar .navbar-inner{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4);box-shadow:0 1px 0 rgba(255, 255, 255, 0.4);-webkit-box-shadow:0 0 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 0 10px rgba(0, 0, 0, 0.1);box-shadow:0 0 10px rgba(0, 0, 0, 0.1);}
 .navbar .nav>li>a{font-weight:bold;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
 .navbar .nav .active>a{background-color:transparent;color:#333333;}.navbar .nav .active>a:hover{background-color:transparent;color:#4183c4;}
+.navbar .nav .open.dropdown .dropdown-toggle{color:#333333;}.navbar .nav .open.dropdown .dropdown-toggle:hover{color:#4183c4;}
 .navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#333333;opacity:1;}
 .navbar .nav .dropdown-toggle:hover .caret{border-top-color:#4183c4;}
 .subnav .nav>li>a{font-weight:bold;color:#777;}.subnav .nav>li>a:hover{color:#4183c4;}
diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less
index 83fc251d..611a806c 100755
--- a/spacelab/bootswatch.less
+++ b/spacelab/bootswatch.less
@@ -42,6 +42,15 @@
 	}
 }
 
+
+.navbar .nav .open.dropdown .dropdown-toggle {
+	color: @textColor;
+	
+	&:hover {
+		color: @linkColor;
+	}
+}
+
 .navbar .nav .dropdown-toggle .caret,
 .navbar .nav .open.dropdown .caret {
 	border-top-color: @textColor;