superhero: fixed pager and nav-pills background colors

franklinsouza1 · Apr 7, 2013 · 9eba534 · 9eba534
1 parent 8768cd7
commit 9eba534
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 29 deletions.
diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css
@@ -6388,7 +6388,7 @@ div.subnav .nav > .active > a:hover .caret {
 }
 
 .nav-list > li > a,
-.nav-list .nav-header {
+.nav-list > .nav-header {
   color: #ece9d7;
   text-shadow: none;
 }
@@ -6432,11 +6432,15 @@ div.subnav .nav > .active > a:hover .caret {
   background-color: #45515f;
 }
 
-.nav-pills > li:hover > a {
+.nav-pills > li > a:hover {
   background-color: #5a6a7d;
   border-color: transparent;
 }
 
+.nav-pills > .disabled > a:hover {
+  background-color: #45515f;
+}
+
 .nav-tabs .open .dropdown-toggle,
 .nav-pills .open .dropdown-toggle,
 .nav > .open.active > a:hover {
@@ -6509,13 +6513,15 @@ div.subnav .nav > .active > a:hover .caret {
   background: #3a4450;
 }
 
-.pager a {
+.pager li > a,
+.pager li > span {
   color: #ece9d7;
   background-color: #45515f;
-  border-color: transparent;
+  border: none;
 }
 
-.pager a:hover {
+.pager li > a:hover,
+.pager li > span:hover {
   background: #5a6a7d;
 }
 

diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css
diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less
@@ -226,29 +226,35 @@ div.subnav {
 }
 
 .nav-list {
+
 	padding: 0 15px;
-}
 
-.nav-list > li > a, .nav-list .nav-header {
-	text-shadow: none;
-	color: @textColor;
-}
+	& > li > a, 
+	& > .nav-header {
+		text-shadow: none;
+		color: @textColor;
+	}
 
-.nav-list .active > a, .nav-list .active > a:hover {
-	text-shadow: none;
-	color: @white;
-}
+	.active > a,
+	.active > a:hover {
+		text-shadow: none;
+		color: @white;
+	}
+
+	li > a:hover {
+		background-color: lighten(@blue, 10%);
+	}
 
-.nav-list li > a:hover {
-	background-color: lighten(@blue, 10%);
 }
 
-.nav-tabs, .nav-tabs.nav-stacked > li > a {
+.nav-tabs,
+.nav-tabs.nav-stacked > li > a {
 	border-color: transparent;
 }
 
 .nav-tabs {
-	> li > a {
+
+	& > li > a {
 		background-color: @blue;
 		color: @textColor;
 	}
@@ -268,14 +274,21 @@ div.subnav {
 	}
 }
 
-.nav-pills > li > a {
-	color: @textColor;
-	background-color: @blue;
-}
+.nav-pills {
 
-.nav-pills > li:hover > a {
-	background-color: lighten(@blue, 10%);
-	border-color: transparent;
+	& > li > a {
+		color: @textColor;
+		background-color: @blue;
+	}
+
+	& > li > a:hover {
+		background-color: lighten(@blue, 10%);
+		border-color: transparent;
+	}
+
+	& > .disabled > a:hover {
+		background-color: @blue;
+	}
 }
 
 .nav-tabs .open .dropdown-toggle,
@@ -353,10 +366,12 @@ div.subnav {
 
 .pager {
 
-	a {
-		color: @textColor;
+	li > a,
+	li > span {
+
 		background-color: @blue;
-		border-color: transparent;
+		border: none;
+		color: @textColor;
 
 		&:hover {
 			background: lighten(@blue, 10%);