From: Thomas Park <thomas@thomaspark.me>
Date: Mon, 6 Aug 2012 02:20:26 +0000 (-0400)
Subject: united: fixed nav-collapse during collapse
X-Git-Tag: v2.0.4~22
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=dabbc85d4fae560b61ba6e765f5246aca031b38b;p=bootswatch

united: fixed nav-collapse during collapse
---

diff --git a/united/bootstrap.css b/united/bootstrap.css
index 80c9e2d..e4f71ac 100644
--- a/united/bootstrap.css
+++ b/united/bootstrap.css
@@ -4223,16 +4223,16 @@ a.badge:hover {
   margin-bottom: 3px;
   border: 1px solid #97310e;
 }
-.navbar .nav-collapse.in > .nav li > a {
+.navbar .nav-collapse.collapse > .nav li > a {
   color: #ffffff;
   border-left: 0px solid #dd4814;
   border-right: 0px solid #dd4814;
 }
-.navbar .nav-collapse.in > .nav li > a:hover {
+.navbar .nav-collapse.collapse > .nav li > a:hover {
   background-color: #97310e;
 }
-.navbar .nav-collapse.in .navbar-form,
-.navbar .nav-collapse.in .navbar-search {
+.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;
diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css
index f9e351f..91252e9 100644
--- a/united/bootstrap.min.css
+++ b/united/bootstrap.min.css
@@ -717,8 +717,8 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
 .navbar .divider-vertical{background-color:inherit;border-right:0px solid #CE4213;}
 .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.in>.nav li>a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}.navbar .nav-collapse.in>.nav li>a:hover{background-color:#97310e;}
-.navbar .nav-collapse.in .navbar-form,.navbar .nav-collapse.in .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 li>a{color:#ffffff;border-left:0px solid #dd4814;border-right:0px solid #dd4814;}.navbar .nav-collapse.collapse>.nav li>a:hover{background-color:#97310e;}
+.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;}
 .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);*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]{background-color:#dd4814;*background-color:#c64012;}
 .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;}
 .btn-warning{background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-ms-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(top, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5d185', endColorstr='#efb73e', 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]{background-color:#efb73e;*background-color:#edae26;}
diff --git a/united/bootswatch.less b/united/bootswatch.less
index 56ea1da..20a3d4b 100755
--- a/united/bootswatch.less
+++ b/united/bootswatch.less
@@ -43,7 +43,7 @@
 		border: 1px solid darken(@navbarBackground, 15%);
 	}
 
-	.nav-collapse.in > .nav li > a {
+	.nav-collapse.collapse > .nav li > a {
 		color: @white;
 		border-left: 0px solid @orange;
 		border-right: 0px solid @orange;
@@ -53,8 +53,8 @@
 		}
 	}
 
-	.nav-collapse.in .navbar-form,
-	.nav-collapse.in .navbar-search {
+	.nav-collapse.collapse .navbar-form,
+	.nav-collapse.collapse .navbar-search {
 		border-top: 0px solid @orange;
 		border-bottom: 0px solid @orange;
 		.box-shadow(none);