From 9dd5eb28876cadbf4705c6ad18fb49241de91503 Mon Sep 17 00:00:00 2001
From: Thomas Park <thomas@thomaspark.me>
Date: Mon, 13 Feb 2012 18:09:22 -0500
Subject: fixed conflict between mobile and full menus for cerulean and united

---
 cerulean/bootstrap.css     | 10 ++++++++--
 cerulean/bootstrap.min.css |  3 ++-
 cerulean/bootswatch.less   | 10 +++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'cerulean')

diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css
index 03b8a885..302a5587 100644
--- a/cerulean/bootstrap.css
+++ b/cerulean/bootstrap.css
@@ -3385,10 +3385,16 @@ h6 {
 .navbar .search-query {
   border: 1px solid #2480b6;
 }
-.navbar .nav-collapse > .nav li > a {
+.navbar .nav-collapse > .nav > li .dropdown-menu a {
+  color: #369bd7;
+}
+.navbar .nav-collapse > .nav > li .dropdown-menu a:hover {
+  color: #ffffff;
+}
+.navbar .nav-collapse.collapse > .nav li > a {
   color: #ffffff;
 }
-.navbar .nav-collapse > .nav li > a:hover {
+.navbar .nav-collapse.collapse > .nav li > a:hover {
   background-color: #2B7CAC;
 }
 .btn-navbar:hover {
diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css
index 236c1c4b..7a77da2d 100644
--- a/cerulean/bootstrap.min.css
+++ b/cerulean/bootstrap.min.css
@@ -609,7 +609,8 @@ h1,h2,h3,h4,h5,h6{color:#317eac;}
 .navbar-inner{background-color:#3f9fd9;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#369bd7), color-stop(90%, #369bd7), to(#61b0df));background-image:-webkit-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:-moz-linear-gradient(top, #369bd7, #369bd7 90%, #61b0df);background-image:-ms-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:-o-linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-image:linear-gradient(#369bd7, #369bd7 90%, #61b0df);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#369bd7', endColorstr='#61b0df', GradientType=0);}
 .navbar .nav .active>a,.navbar .nav .active>a:hover{background-color:#369bd7;background-color:rgba(0, 0, 0, 0.2);}
 .navbar .search-query{border:1px solid #2480b6;}
-.navbar .nav-collapse>.nav li>a{color:#ffffff;}.navbar .nav-collapse>.nav li>a:hover{background-color:#2B7CAC;}
+.navbar .nav-collapse>.nav>li .dropdown-menu a{color:#369bd7;}.navbar .nav-collapse>.nav>li .dropdown-menu a:hover{color:#ffffff;}
+.navbar .nav-collapse.collapse>.nav li>a{color:#ffffff;}.navbar .nav-collapse.collapse>.nav li>a:hover{background-color:#2B7CAC;}
 .btn-navbar:hover{background-color:#cccccc;background-position:0 0;}
 .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#dd5600;}
 .control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#dd5600;border-color:#dd5600;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#aa4200;-webkit-box-shadow:0 0 6px #ff8d44;-moz-box-shadow:0 0 6px #ff8d44;box-shadow:0 0 6px #ff8d44;}
diff --git a/cerulean/bootswatch.less b/cerulean/bootswatch.less
index 8130de52..37110250 100755
--- a/cerulean/bootswatch.less
+++ b/cerulean/bootswatch.less
@@ -34,7 +34,15 @@ h1,h2,h3,h4,h5,h6 {
 
 // responsive menu colors
 
-.navbar .nav-collapse > .nav li > a {
+.navbar .nav-collapse > .nav > li .dropdown-menu a {
+	color: @linkColor;
+	
+	&:hover {
+		color: @white;
+	}
+}
+
+.navbar .nav-collapse.collapse > .nav li > a {
 	color: @white;
 	
 	&:hover {
-- 
cgit v1.2.3