fixes thomaspark#93, remove hover effects on disabled nav

stanpues · Apr 25, 2013 · 596fedd · 596fedd
1 parent 2a062f7
commit 596fedd
Show file tree

Hide file tree

Showing 15 changed files with 151 additions and 69 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
@@ -6363,20 +6363,13 @@ div.subnav-fixed {
   }
 }
 
-.nav-tabs li.open > .dropdown-toggle,
-.nav-pills li.open > .dropdown-toggle {
-  color: #e8d069;
-  background-color: #8AD5DC;
-  border-color: transparent;
-}
-
 .nav-tabs,
 .nav-pills {
   border-color: transparent;
 }
 
-.nav-tabs li > a,
-.nav-pills li > a {
+.nav-tabs > li > a,
+.nav-pills > li > a {
   border-color: transparent;
   -webkit-border-radius: 0;
      -moz-border-radius: 0;
@@ -6386,26 +6379,41 @@ div.subnav-fixed {
           box-shadow: 0;
 }
 
-.nav-tabs li.active > a,
-.nav-pills li.active > a,
-.nav-tabs li.active > a:hover,
-.nav-pills li.active > a:hover {
-  color: #e1f0f0;
+.nav-tabs > li > a:hover,
+.nav-pills > li > a:hover {
+  text-shadow: none;
+  background-color: #8AD5DC;
+  border-color: transparent;
 }
 
-.nav-tabs li.active > a,
-.nav-pills li.active > a,
-.nav-tabs li > a:hover,
-.nav-pills li > a:hover,
-.nav-tabs li.active > a:hover,
-.nav-pills li.active > a:hover {
+.nav-tabs > .active > a,
+.nav-pills > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-pills > .active > a:hover {
+  color: #e1f0f0;
   text-shadow: none;
   background-color: #8AD5DC;
   border-color: transparent;
 }
 
-.nav-tabs,
-.nav-tabs > li > a {
+.nav-tabs > .disabled > a,
+.nav-pills > .disabled > a,
+.nav-tabs > .disabled > a:hover,
+.nav-pills > .disabled > a:hover {
+  color: #dddddd;
+  background: none;
+}
+
+.nav-tabs > .open > .dropdown-toggle,
+.nav-pills > .open > .dropdown-toggle,
+.nav-tabs > .open > .dropdown-toggle,
+.nav-pills > .open > .dropdown-toggle {
+  color: #e8d069;
+  background-color: #8AD5DC;
+  border-color: transparent;
+}
+
+.nav-tabs {
   border-bottom: 1px solid rgba(255, 255, 255, 0.5);
 }
 
@@ -6473,8 +6481,9 @@ div.subnav-fixed {
   color: #ffffff;
 }
 
-.breadcrumb .divider {
-  color: #e8d069;
+.breadcrumb > li > a.divider,
+.breadcrumb > li > span.divider {
+  color: #dddddd;
 }
 
 .pagination ul {

diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
@@ -216,56 +216,69 @@ div.subnav {
 // NAV
 // -----------------------------------------------------
 
-.nav-tabs li.open > .dropdown-toggle,
-.nav-pills li.open > .dropdown-toggle {
-	background-color: #8AD5DC;
-	color: @linkColor;
-	border-color: transparent;
-}
+.nav-tabs,
+.nav-pills {
 
-.nav-tabs, .nav-pills {
 	border-color: transparent;
 
-	li > a {
+
+	& > li > a {
 		border-color: transparent;
 		.border-radius(0);
 		.box-shadow(0);
 	}
 
-	li.active > a,
-	li.active > a:hover {
-		color: @textColor;
+	& > li > a:hover {
+		background-color: #8AD5DC;
+		border-color: transparent;
+		text-shadow: none;
 	}
 
-	li.active > a,
-	li > a:hover,
-	li.active > a:hover {
+	& > .active > a,
+	& > .active > a:hover {
 		background-color: #8AD5DC;
 		border-color: transparent;
+		color: @textColor;
 		text-shadow: none;
 	}
-}
 
-.nav-tabs, .nav-tabs > li > a {
-	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
-}
+	& > .disabled > a,
+	& > .disabled > a:hover {
+		background: none;
+		color: @grayLighter;
+	}
+
+	& > .open > .dropdown-toggle,
+	& > .open > .dropdown-toggle {
+		background-color: #8AD5DC;
+		color: @linkColor;
+		border-color: transparent;
+	}
+
 
-.nav-tabs > li > a {
-	background-color: #3CB9C6;
 }
 
-.nav-tabs.nav-stacked {
+.nav-tabs {
 
-	li > a:first-child,
-	li > a:last-child {
-		.border-radius(0);
+	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+
+	& > li > a  {
+		background-color: #3CB9C6;
 	}
 
-	li > a,
-	li > a:hover,
-	li.active > a,
-	li.active > a:hover {
-		border-color: transparent;
+	&.nav-stacked {
+
+		li > a:first-child,
+		li > a:last-child {
+			.border-radius(0);
+		}
+
+		li > a,
+		li > a:hover,
+		li.active > a,
+		li.active > a:hover {
+			border-color: transparent;
+		}
 	}
 }
 
@@ -301,6 +314,7 @@ div.subnav {
 }
 
 .breadcrumb {
+
 	background-color: #3CB9C6;
 	background-image: none;
 
@@ -312,8 +326,9 @@ div.subnav {
 		color: @white;
 	}
 
-	.divider {
-		color: @linkColor;
+	& > li > a.divider,
+	& > li > span.divider {
+		color: @grayLighter;
 	}
 }
 

diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
@@ -6373,6 +6373,10 @@ div.subnav-fixed {
   border-color: transparent;
 }
 
+.nav-tabs li.disabled > a {
+  color: #999999;
+}
+
 .nav-tabs .open .dropdown-toggle {
   background-color: #060606;
   border-color: transparent;
@@ -6383,6 +6387,10 @@ div.subnav-fixed {
   background-color: #33b5e5;
 }
 
+.nav-pills li.disabled > a {
+  color: #999999;
+}
+
 .nav-pills .open .dropdown-toggle {
   background-color: #060606;
 }
@@ -6978,4 +6986,4 @@ label {
 
 .affix {
   position: fixed;
-}
+}
diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
@@ -220,6 +220,10 @@ div.subnav {
 		color: @white;
 	}
 
+	li.disabled > a {
+		color: @textColor;
+	}
+
 	.open .dropdown-toggle {
 		background-color: #060606;
 		border-color: transparent;
@@ -233,6 +237,10 @@ div.subnav {
 		color: @white;
 	}
 
+	li.disabled > a {
+		color: @textColor;
+	}
+
 	.open .dropdown-toggle {
 		background-color: #060606;
 	}

diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css
@@ -6322,6 +6322,11 @@ div.subnav .nav > li.active > a:hover {
   background-color: #f7f7f7;
 }
 
+.nav-tabs > li.disabled > a:hover {
+  color: #999999;
+  background-color: #efefef;
+}
+
 .nav-tabs .dropdown .dropdown-toggle .caret {
   border-top-color: #555555;
   border-bottom-color: #555555;
@@ -6386,6 +6391,10 @@ div.subnav .nav > li.active > a:hover {
   background-color: #fbebe9;
 }
 
+.nav-pills > li.disabled > a:hover {
+  color: #999999;
+}
+
 .nav-pills .dropdown .dropdown-toggle .caret {
   border-top-color: #555555;
   border-bottom-color: #555555;
@@ -6506,11 +6515,9 @@ legend {
 }
 
 .label {
-  padding: 4px 4px 3px;
+  padding: 6px 12px;
   margin-right: 1px;
   margin-left: 1px;
-  font-weight: normal;
-  line-height: 26px;
 }
 
 i[class^="icon-"] {
@@ -6583,4 +6590,4 @@ i[class^="icon-"] {
 
 .affix {
   position: fixed;
-}
+}
diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css
diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less
@@ -192,6 +192,11 @@ div.subnav {
 		background-color: @bodyBackground;
 	}
 
+	& > li.disabled > a:hover {
+		background-color: darken(@bodyBackground, 3%);
+		color: @grayLight;
+	}
+
 	.dropdown {
 
 		.dropdown-toggle .caret {
@@ -265,6 +270,10 @@ div.subnav {
 		color: @linkColor;
 	}
 
+	& > li.disabled > a:hover {
+		color: @grayLight;
+	}
+
 	.dropdown .dropdown-toggle .caret {
 		border-top-color: @textColor;
 		border-bottom-color: @textColor;
@@ -401,11 +410,9 @@ legend {
 // -----------------------------------------------------
 
 .label {
-	padding: 4px 4px 3px;
+	padding: 6px 12px;
 	margin-left: 1px;
 	margin-right: 1px;
-	line-height: 26px;
-	font-weight: normal;
 }
 
 // MISCELLANEOUS

diff --git a/slate/bootstrap.css b/slate/bootstrap.css
@@ -6417,6 +6417,11 @@ div.subnav.subnav-fixed .nav > li:first-child > a:hover {
   border: none;
 }
 
+.nav > li.disabled > a,
+.nav > li.disabled > a:hover {
+  color: #52575c;
+}
+
 .nav li > a:hover {
   color: #bbbfc2;
   background-color: transparent;
@@ -6601,6 +6606,14 @@ div.subnav.subnav-fixed .nav > li:first-child > a:hover {
 .pager .disabled a,
 .pager .disabled a:hover {
   background-color: transparent;
+  background-color: #3a3f44;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#52575c), color-stop(70%, #3a3f44), to(#3a3f44));
+  background-image: -webkit-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-image: -moz-linear-gradient(top, #52575c, #3a3f44 70%, #3a3f44);
+  background-image: -o-linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-image: linear-gradient(#52575c, #3a3f44 70%, #3a3f44);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff52575c', endColorstr='#ff3a3f44', GradientType=0);
 }
 
 .btn {
@@ -7045,4 +7058,4 @@ a.thumbnail:hover {
 
 .affix {
   position: fixed;
-}
+}
diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css