fixed conflict between mobile and full menus for cerulean and united

diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css
index 03b8a88..302a558 100644 (file)
--- 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 236c1c4..7a77da2 100644 (file)
--- 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 8130de5..3711025 100755 (executable)
--- 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 {

diff --git a/united/bootstrap.css b/united/bootstrap.css
index d34a4a7..8706158 100644 (file)
--- a/united/bootstrap.css
+++ b/united/bootstrap.css
@@ -3363,13 +3363,19 @@ a.thumbnail:hover {
 .navbar-search .search-query {
   border: 1px solid #97310e;
 }
-.navbar .nav-collapse > .nav > li a {
+.navbar .nav-collapse > .nav > li .dropdown-menu a {
+  color: #dd4814;
+}
+.navbar .nav-collapse > .nav > li .dropdown-menu a:hover {
+  color: #ffffff;
+}
+.navbar .nav-collapse.collapse > .nav li > a {
   color: #ffffff;
   border-left: 0px solid #dd4814;
   border-right: 0px solid #dd4814;
 }
-.navbar .nav-collapse > .nav > li a:hover {
-  background-color: #A6350F;
+.navbar .nav-collapse.collapse > .nav li > a:hover {
+  background-color: #2B7CAC;
 }
 .navbar .nav-collapse .navbar-form, .navbar .nav-collapse .navbar-search {
   border-top: 0px solid #dd4814;

diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css
index c524d3e..89ecb72 100644 (file)
--- a/united/bootstrap.min.css
+++ b/united/bootstrap.min.css
@@ -608,8 +608,8 @@ a.thumbnail:hover{border-color:#dd4814;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .navbar .nav .active>a,.navbar .nav .active>a:hover{background-color:rgba(0, 0, 0, 0.2);}
 .navbar .divider-vertical{background-color:inherit;border-right:0px solid #CE4213;}
 .navbar-search .search-query{border:1px solid #97310e;}
-.navbar .nav-collapse>.nav>li a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}
-.navbar .nav-collapse>.nav>li a:hover{background-color:#A6350F;}
+.navbar .nav-collapse>.nav>li .dropdown-menu a{color:#dd4814;}.navbar .nav-collapse>.nav>li .dropdown-menu a:hover{color:#ffffff;}
+.navbar .nav-collapse.collapse>.nav li>a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}.navbar .nav-collapse.collapse>.nav li>a:hover{background-color:#2B7CAC;}
 .navbar .nav-collapse .navbar-form,.navbar .nav-collapse .navbar-search{border-top:0px solid #dd4814;border-bottom:0px solid #dd4814;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn-primary{background-color:#e86537;background-image:-moz-linear-gradient(top, #ef784e, #dd4814);background-image:-ms-linear-gradient(top, #ef784e, #dd4814);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ef784e), to(#dd4814));background-image:-webkit-linear-gradient(top, #ef784e, #dd4814);background-image:-o-linear-gradient(top, #ef784e, #dd4814);background-image:linear-gradient(top, #ef784e, #dd4814);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef784e', endColorstr='#dd4814', GradientType=0);border-color:#dd4814 #dd4814 #97310e;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#dd4814;}
 .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;}

diff --git a/united/bootswatch.less b/united/bootswatch.less
index 46aebea..fb014a1 100755 (executable)
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -33,14 +33,22 @@
        border: 1px solid darken(@navbarBackground, 15%);
 }
 
-.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;
        border-left: 0px solid @orange;
        border-right: 0px solid @orange;
-}
-
-.navbar .nav-collapse > .nav > li a:hover {
-       background-color: #A6350F;
+       
+       &:hover {
+               background-color: #2B7CAC;
+       }
 }
 
 .navbar .nav-collapse .navbar-form,