3 files changed, 27 insertions, 25 deletions
diff --git a/united/bootstrap.css b/united/bootstrap.css
index e86d6f88..3b589251 100644
--- a/united/bootstrap.css
+++ b/united/bootstrap.css
@@ -4773,25 +4773,27 @@ a.badge:hover {
   margin-bottom: 3px;
   border: 1px solid #97310e;
 }
-.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: rgba(0, 0, 0, 0.3);
-  background-image: none;
-}
-.navbar .nav-collapse.collapse .navbar-form,
-.navbar .nav-collapse.collapse .navbar-search {
-  border-top: 0px solid #dd4814;
-  border-bottom: 0px solid #dd4814;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.navbar .nav-collapse.collapse .nav-header {
-  color: #f5f5f5;
+@media (max-width: 979px) {
+  .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: rgba(0, 0, 0, 0.3) !important;
+    background-image: none;
+  }
+  .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;
+  }
+  .navbar .nav-collapse .nav-header {
+    color: #f5f5f5;
+  }
 }
 .nav-tabs .open .dropdown-toggle,
 .nav-pills .open .dropdown-toggle,
diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css
index 18b68af9..1a3d6d57 100644
--- a/united/bootstrap.min.css
+++ b/united/bootstrap.min.css
@@ -806,10 +806,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .navbar .divider-vertical{background-color:inherit;border-right:1px solid rgba(0, 0, 0, 0.2);}
 .navbar .navbar-text{padding:9px 10px 11px;line-height:19px;color:#ffffff;}
 .navbar .navbar-search .search-query{margin-bottom:3px;border:1px solid #97310e;}
-.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:rgba(0, 0, 0, 0.3);background-image:none;}
-.navbar .nav-collapse.collapse .navbar-form,.navbar .nav-collapse.collapse .navbar-search{border-top:0px solid #dd4814;border-bottom:0px solid #dd4814;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.navbar .nav-collapse.collapse .nav-header{color:#f5f5f5;}
-.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;}
+@media (max-width:979px){.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:rgba(0, 0, 0, 0.3) !important;background-image:none;} .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;} .navbar .nav-collapse .nav-header{color:#f5f5f5;}}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-right:1px solid #C03D14;border-left:1px solid #E6633A;}
 .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e86537;background-image:-moz-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(to bottom, #ef784e, #dd4814);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffef784e', endColorstr='#ffdd4814', 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);*background-color:#dd4814;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#dd4814;*background-color:#c64012;}
 .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;}
 .btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5d185), to(#efb73e));background-image:-webkit-linear-gradient(top, #f5d185, #efb73e);background-image:-o-linear-gradient(top, #f5d185, #efb73e);background-image:linear-gradient(to bottom, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5d185', endColorstr='#ffefb73e', GradientType=0);border-color:#efb73e #efb73e #cf9311;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#efb73e;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#efb73e;*background-color:#edae26;}
diff --git a/united/bootswatch.less b/united/bootswatch.less
index f2d20b6e..1ab51ccf 100755
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -45,8 +45,11 @@
 		margin-bottom: 3px;
 		border: 1px solid darken(@navbarBackground, 15%);
 	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
 
-	.nav-collapse.collapse {
+	.navbar .nav-collapse {
 
 		.nav li > a {
 			color: @white;
@@ -54,7 +57,7 @@
 			border-right: 0px solid @orange;
 
 			&:hover {
-				background-color: rgba(0, 0, 0, 0.3);
+				background-color: rgba(0, 0, 0, 0.3) !important;
 				background-image: none;
 			}
 		}