all: fixes pagination issues, closes #37

21 files changed, 225 insertions, 127 deletions

diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 7d3d0fbd..cf26da2d 100644
--- a/amelia/bootstrap.css
+++ b/amelia/bootstrap.css
@@ -5164,27 +5164,33 @@ div.subnav-fixed {
 .pagination ul {
   background-color: #3cb9c6;
   background-image: none;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
 }
-.pagination .disabled a,
-.pagination .disabled a:hover {
-  color: rgba(255, 255, 255, 0.9);
-}
-.pagination li a:hover {
+.pagination ul > li > a:hover {
   background-color: rgba(255, 255, 255, 0.4);
   color: #e8d069;
 }
-.pagination .active a,
-.pagination .active a:hover {
-  background-color: rgba(255, 255, 255, 0.4);
-  color: rgba(255, 255, 255, 0.9);
-}
-.pagination ul,
-.pagination li:first-child a,
-.pagination li:last-child a {
+.pagination ul > li:first-child > a,
+.pagination ul > li:last-child > a {
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
 }
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > span:hover {
+  color: rgba(255, 255, 255, 0.9);
+}
+.pagination ul > .active > a,
+.pagination ul > .active > a:hover,
+.pagination ul > .active > span,
+.pagination ul > .active > span:hover {
+  background-color: rgba(255, 255, 255, 0.4);
+  color: rgba(255, 255, 255, 0.9);
+}
 .pager li > a {
   background-color: #3CB9C6;
 }
diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
index bbfe1916..9b8fc8b0 100644
--- a/amelia/bootstrap.min.css
+++ b/amelia/bootstrap.min.css
@@ -867,11 +867,11 @@ div.subnav-fixed{top:50px;}
 .breadcrumb{background-color:#3CB9C6;background-image:none;}.breadcrumb li{text-shadow:none;}
 .breadcrumb .active{color:#ffffff;}
 .breadcrumb .divider{color:#e8d069;}
-.pagination ul{background-color:#3cb9c6;background-image:none;}
-.pagination .disabled a,.pagination .disabled a:hover{color:rgba(255, 255, 255, 0.9);}
-.pagination li a:hover{background-color:rgba(255, 255, 255, 0.4);color:#e8d069;}
-.pagination .active a,.pagination .active a:hover{background-color:rgba(255, 255, 255, 0.4);color:rgba(255, 255, 255, 0.9);}
-.pagination ul,.pagination li:first-child a,.pagination li:last-child a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.pagination ul{background-color:#3cb9c6;background-image:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.pagination ul>li>a:hover{background-color:rgba(255, 255, 255, 0.4);color:#e8d069;}
+.pagination ul>li:first-child>a,.pagination ul>li:last-child>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{color:rgba(255, 255, 255, 0.9);}
+.pagination ul>.active>a,.pagination ul>.active>a:hover,.pagination ul>.active>span,.pagination ul>.active>span:hover{background-color:rgba(255, 255, 255, 0.4);color:rgba(255, 255, 255, 0.9);}
 .pager li>a{background-color:#3CB9C6;}.pager li>a:hover{background-color:#8AD5DC;}
 .pager .disabled a,.pager .disabled a:hover{background-color:#3CB9C6;color:#ffffff;}
 .btn{padding:12px 16px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-image:none;text-shadow:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#dddddd;border-color:transparent;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#d0d0d0;text-shadow:none;}
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index 500e52bc..c5c7b87e 100755
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -323,26 +323,32 @@ div.subnav {
 	ul  {
 		background-color: @paginationBackground;
 		background-image: none;
+		.border-radius(0);
 	}
 
-	.disabled a, .disabled a:hover {
-		color: @textColor;
-	}
-
-	li a:hover {
+	ul > li > a:hover {
 		background-color: rgba(255, 255, 255, 0.4);
 		color: @linkColor;
 	}
 
-	.active a, .active a:hover {
-		background-color: rgba(255, 255, 255, 0.4);
+	ul > li:first-child > a,
+	ul > li:last-child > a {
+		.border-radius(0);
+	}
+
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
 		color: @textColor;
 	}
 
-	ul,
-	li:first-child a,
-	li:last-child a {
-		.border-radius(0);
+	ul > .active > a,
+	ul > .active > a:hover,
+	ul > .active > span,
+	ul > .active > span:hover {
+		background-color: rgba(255, 255, 255, 0.4);
+		color: @textColor;
 	}
 }
 
diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
index cc44232e..a4a4be2e 100644
--- a/cyborg/bootstrap.css
+++ b/cyborg/bootstrap.css
@@ -5164,18 +5164,24 @@ div.subnav .nav .open .dropdown-menu li > a:hover {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.pagination a {
+.pagination ul > li > a,
+.pagination ul > li > span {
   border: 0;
   font-size: 14px;
 }
-.pagination a:hover,
-.pagination .active a {
+.pagination ul > li > a:hover {
   background-color: #33b5e5;
   color: #ffffff;
 }
-.pagination .disabled span,
-.pagination .disabled a,
-.pagination .disabled a:hover {
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: #33b5e5;
+  color: #ffffff;
+}
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > span:hover {
   background-color: rgba(0, 0, 0, 0.2);
 }
 .pager a {
diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
index 9e77a0c3..94f99100 100644
--- a/cyborg/bootstrap.min.css
+++ b/cyborg/bootstrap.min.css
@@ -869,9 +869,10 @@ div.subnav .nav .open .dropdown-menu{background-color:#020202;border-left:solid
 .breadcrumb{background-color:transparent;background-image:none;border-width:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;font-size:14px;}.breadcrumb li>a{color:#33b5e5;text-shadow:none;}
 .breadcrumb li.active{text-shadow:none;}
 .pagination ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.pagination a{border:0;font-size:14px;}
-.pagination a:hover,.pagination .active a{background-color:#33b5e5;color:#ffffff;}
-.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{background-color:rgba(0, 0, 0, 0.2);}
+.pagination ul>li>a,.pagination ul>li>span{border:0;font-size:14px;}
+.pagination ul>li>a:hover{background-color:#33b5e5;color:#ffffff;}
+.pagination ul>.active>a,.pagination ul>.active>span{background-color:#33b5e5;color:#ffffff;}
+.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background-color:rgba(0, 0, 0, 0.2);}
 .pager a{background-color:#060606;border:none;}.pager a:hover{background-color:#33b5e5;}
 .pager .disabled a,.pager .disabled a:hover{background-color:#060606;}
 .btn{-webkit-box-shadow:1px 1px 2px #111111;-moz-box-shadow:1px 1px 2px #111111;box-shadow:1px 1px 2px #111111;color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5c5c5c;background-image:-moz-linear-gradient(top, #666666, #4d4d4d);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#666666), to(#4d4d4d));background-image:-webkit-linear-gradient(top, #666666, #4d4d4d);background-image:-o-linear-gradient(top, #666666, #4d4d4d);background-image:linear-gradient(to bottom, #666666, #4d4d4d);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff666666', endColorstr='#ff4d4d4d', GradientType=0);border-color:#4d4d4d #4d4d4d #262626;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#4d4d4d;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);color:#ffffff;text-shadow:none;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#4d4d4d;*background-color:#404040;}
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
index 642bf0a4..c2988718 100755
--- a/cyborg/bootswatch.less
+++ b/cyborg/bootswatch.less
@@ -342,23 +342,32 @@ div.subnav {
 }
 
 .pagination {
+
 	ul {
 		.box-shadow(none);
 	}
 
-	a {
+	ul > li > a,
+	ul > li > span {
 		border: 0;
 		font-size: 14px;
 	}
 
-	a:hover, .active a {
+	ul > li > a:hover {
 		background-color: @blue;
 		color: @white;
 	}
 
-	.disabled span,
-	.disabled a,
-	.disabled a:hover {
+	ul > .active > a,
+	ul > .active > span {
+		background-color: @blue;
+		color: @white;	
+	}
+
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
 		background-color: rgba(0, 0, 0, 0.2);
 	}
 }
diff --git a/readable/bootstrap.css b/readable/bootstrap.css
index f766fb75..afff0728 100644
--- a/readable/bootstrap.css
+++ b/readable/bootstrap.css
@@ -5110,19 +5110,11 @@ div.subnav-fixed {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.pagination ul > li > a {
-  padding: 12px 14px 8px;
-  line-height: 1;
-}
-.pagination ul > li.active > a,
-.pagination ul > li.active > a:hover {
-  color: #282828;
-  background-color: #F5F5F5;
-}
 .pagination ul > li > a,
-.pagination ul > li.disabled > a,
-.pagination ul > li.disabled > a:hover {
+.pagination ul > li > span {
+  padding: 12px 14px 8px;
   background-color: #ffffff;
+  line-height: 1;
 }
 .pagination ul > li:first-child > a,
 .pagination ul > li:last-child > a {
@@ -5130,6 +5122,19 @@ div.subnav-fixed {
   -moz-border-radius: 0;
   border-radius: 0;
 }
+.pagination ul > .active > a,
+.pagination ul > .active > a:hover,
+.pagination ul > .active > span,
+.pagination ul > .active > span:hover {
+  color: #282828;
+  background-color: #F5F5F5;
+}
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > span:hover {
+  background-color: #ffffff;
+}
 .pager a {
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css
index a0b1a97c..c01b7d2d 100644
--- a/readable/bootstrap.min.css
+++ b/readable/bootstrap.min.css
@@ -865,10 +865,10 @@ div.subnav-fixed{top:50px;}
 .nav-list .divider{margin:1px;}
 .breadcrumb{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:transparent;background-image:none;}
 .pagination ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.pagination ul>li>a{padding:12px 14px 8px;line-height:1;}
-.pagination ul>li.active>a,.pagination ul>li.active>a:hover{color:#282828;background-color:#F5F5F5;}
-.pagination ul>li>a,.pagination ul>li.disabled>a,.pagination ul>li.disabled>a:hover{background-color:#ffffff;}
+.pagination ul>li>a,.pagination ul>li>span{padding:12px 14px 8px;background-color:#ffffff;line-height:1;}
 .pagination ul>li:first-child>a,.pagination ul>li:last-child>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.pagination ul>.active>a,.pagination ul>.active>a:hover,.pagination ul>.active>span,.pagination ul>.active>span:hover{color:#282828;background-color:#F5F5F5;}
+.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background-color:#ffffff;}
 .pager a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#bb0001;background-image:-moz-linear-gradient(top, #cf0001, #9c0001);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#cf0001), to(#9c0001));background-image:-webkit-linear-gradient(top, #cf0001, #9c0001);background-image:-o-linear-gradient(top, #cf0001, #9c0001);background-image:linear-gradient(to bottom, #cf0001, #9c0001);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcf0001', endColorstr='#ff9c0001', GradientType=0);border-color:#9c0001 #9c0001 #500001;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#9c0001;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:#9c0001;*background-color:#830001;}
 .btn-primary:active,.btn-primary.active{background-color:#690001 \9;}
diff --git a/readable/bootswatch.less b/readable/bootswatch.less
index fd94a40d..2298b0f4 100755
--- a/readable/bootswatch.less
+++ b/readable/bootswatch.less
@@ -290,28 +290,32 @@ div.subnav {
 		.box-shadow(none);
 	}
 
-	ul > li > a {
+	ul > li > a,
+	ul > li > span {
 		padding: 12px 14px 8px;
+		background-color: @white;
 		line-height: 1;
 	}
 
+	ul > li:first-child > a,
+	ul > li:last-child > a {
+		.border-radius(0);
+	}
 
-	ul > li.active > a,
-	ul > li.active > a:hover {
+	ul > .active > a,
+	ul > .active > a:hover,
+	ul > .active > span,
+	ul > .active > span:hover {
 		color: @textColor;
 		background-color: #F5F5F5;
 	}
 
-	ul > li > a,
-	ul > li.disabled > a,
-	ul > li.disabled > a:hover {
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
 		background-color: @white;
 	}
-
-	ul > li:first-child > a,
-	ul > li:last-child > a {
-		.border-radius(0);
-	}
 }
 
 .pager {
diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css
index b833e56a..522d9e78 100644
--- a/simplex/bootstrap.css
+++ b/simplex/bootstrap.css
@@ -5102,33 +5102,47 @@ div.subnav .nav > li.active > a:hover {
   color: #d9230f;
 }
 .breadcrumb {
+  background-color: #ffffff;
+  border: 0px solid transparent;
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) ,  -1px -1px 0 rgba(0, 0, 0, 0.1);
-  border: 0px solid transparent;
 }
 .breadcrumb li {
-  padding-top: 5px;
+  padding-top: 2px;
   text-shadow: none;
 }
+.breadcrumb .active {
+  color: #555555;
+}
 .breadcrumb a {
   text-shadow: none;
 }
 .breadcrumb a:hover {
   text-decoration: none;
 }
-.pagination li > a {
-  padding: 4px 14px 0;
+.pagination ul > li > a,
+.pagination ul > li > span {
+  padding: 2px 14px 0;
   color: #555555;
 }
-.pagination li > a:hover {
+.pagination ul > li > a:hover,
+.pagination ul > li > span:hover {
   background-color: #fbebe9;
   color: #d9230f;
 }
-.pagination li.active > a {
+.pagination ul > .active > a,
+.pagination ul > .active > span {
   background-color: #fbebe9;
   color: #d9230f;
 }
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > span:hover {
+  background-color: transparent;
+  color: #555555;
+}
 .btn {
   padding-top: .6em;
   font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css
index 7a016f78..a1164823 100644
--- a/simplex/bootstrap.min.css
+++ b/simplex/bootstrap.min.css
@@ -856,11 +856,13 @@ div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{border-left-color:
 .nav-pills .dropdown.open .dropdown-toggle,.nav-pills .dropdown.open:hover .dropdown-toggle{background-color:#fbebe9;color:#d9230f;}.nav-pills .dropdown.open .dropdown-toggle .caret,.nav-pills .dropdown.open:hover .dropdown-toggle .caret{border-top-color:#d9230f;border-bottom-color:#d9230f;}
 .nav-list li>a{color:#555555;}.nav-list li>a:hover{background-color:#fbebe9;color:#d9230f;}
 .nav-list li.active>a,.nav-list li.active>a:hover{background-color:#fbebe9;color:#d9230f;}
-.breadcrumb{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:0px solid transparent;}.breadcrumb li{padding-top:5px;text-shadow:none;}
+.breadcrumb{background-color:#ffffff;border:0px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);}.breadcrumb li{padding-top:2px;text-shadow:none;}
+.breadcrumb .active{color:#555555;}
 .breadcrumb a{text-shadow:none;}
 .breadcrumb a:hover{text-decoration:none;}
-.pagination li>a{padding:4px 14px 0;color:#555555;}.pagination li>a:hover{background-color:#fbebe9;color:#d9230f;}
-.pagination li.active>a{background-color:#fbebe9;color:#d9230f;}
+.pagination ul>li>a,.pagination ul>li>span{padding:2px 14px 0;color:#555555;}.pagination ul>li>a:hover,.pagination ul>li>span:hover{background-color:#fbebe9;color:#d9230f;}
+.pagination ul>.active>a,.pagination ul>.active>span{background-color:#fbebe9;color:#d9230f;}
+.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background-color:transparent;color:#555555;}
 .btn{padding-top:.6em;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:bold;}
 legend{border-bottom:1px solid #ddd;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;}
 .navbar-search .search-query{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#f7f7f7;color:#555555;}
diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less
index 816829b5..59868f9e 100755
--- a/simplex/bootswatch.less
+++ b/simplex/bootswatch.less
@@ -306,14 +306,19 @@ div.subnav {
 }
 
 .breadcrumb {
-	.box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
+	background-color: @white;
 	border: 0px solid transparent;
+	.box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
 
 	li {
-		padding-top: 5px;
+		padding-top: 2px;
 		text-shadow: none;
 	}
 
+	.active {
+		color: @textColor;
+	}
+
 	a {
 		text-shadow: none;
 	}
@@ -325,8 +330,9 @@ div.subnav {
 
 .pagination {
 
-	li > a {
-		padding: 4px 14px 0;
+	ul > li > a,
+	ul > li > span {
+		padding: 2px 14px 0;
 		color: @textColor;
 
 		&:hover {
@@ -335,10 +341,19 @@ div.subnav {
 		}
 	}
 
-	li.active > a {
+	ul > .active > a,
+	ul > .active > span {
 		background-color: @dropdownLinkBackgroundHover;
 		color: @linkColor;
 	}
+
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
+		background-color: transparent;
+		color: @textColor;
+	}
 }
 
 
diff --git a/slate/bootstrap.css b/slate/bootstrap.css
index b9e8229f..4f42910c 100644
--- a/slate/bootstrap.css
+++ b/slate/bootstrap.css
@@ -5169,7 +5169,8 @@ div.subnav.subnav-fixed {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.pagination ul > li > a {
+.pagination ul > li > a,
+.pagination ul > li > span {
   border-left: 1px solid #52575c;
   border-right: 1px solid #2e3134;
   border-top: none;
@@ -5189,7 +5190,8 @@ div.subnav.subnav-fixed {
   font-weight: bold;
   text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 }
-.pagination ul > li > a:hover {
+.pagination ul > li > a:hover,
+.pagination ul > li > span:hover {
   background-color: #3a3f44;
   background-repeat: repeat-x;
   background-image: -moz-linear-gradient(280deg, #272b30, #3a3f44);
@@ -5198,8 +5200,10 @@ div.subnav.subnav-fixed {
   background-image: linear-gradient(280deg, #272b30, #3a3f44);
   border-left: 1px solid transparent;
 }
-.pagination ul > li.active > a,
-.pagination ul > li.active > a:hover {
+.pagination ul > .active > a,
+.pagination ul > .active > a:hover,
+.pagination ul > .active > span,
+.pagination ul > .active > span:hover {
   color: #bbbfc2;
   background-color: #3a3f44;
   background-color: #43494f;
@@ -5210,8 +5214,10 @@ div.subnav.subnav-fixed {
   background-image: linear-gradient(280deg, #30353b, #43494f);
   border-left: 1px solid transparent;
 }
-.pagination ul > li.disabled > a,
-.pagination ul > li.disabled > a:hover {
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > span:hover {
   border-left: 1px solid #52575c;
   border-right: 1px solid #2e3134;
   border-top: none;
diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css
index 1e8e22cf..dceb221a 100644
--- a/slate/bootstrap.min.css
+++ b/slate/bootstrap.min.css
@@ -860,9 +860,9 @@ div.subnav.subnav-fixed{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:
 .breadcrumb{border:1px solid 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);-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';}.breadcrumb a{color:#bbbfc2;font-weight:bold;}
 .breadcrumb li{color:#757c82;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}
 .pagination ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.pagination ul>li>a{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;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);-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';color:#bbbfc2;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}.pagination ul>li>a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;}
-.pagination ul>li.active>a,.pagination ul>li.active>a:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-left:1px solid transparent;}
-.pagination ul>li.disabled>a,.pagination ul>li.disabled>a:hover{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;background-color:#52575c;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));background-image:-webkit-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:-moz-linear-gradient(top, #757c82, #52575c 70%, #52575c);background-image:-o-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:linear-gradient(#757c82, #52575c 70%, #52575c);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);}
+.pagination ul>li>a,.pagination ul>li>span{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;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);-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';color:#bbbfc2;font-weight:bold;text-shadow:1px 1px 1px rgba(0, 0, 0, 0.3);}.pagination ul>li>a:hover,.pagination ul>li>span:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border-left:1px solid transparent;}
+.pagination ul>.active>a,.pagination ul>.active>a:hover,.pagination ul>.active>span,.pagination ul>.active>span:hover{color:#bbbfc2;background-color:#3a3f44;background-color:#43494f;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #30353b, #43494f);background-image:-webkit-linear-gradient(280deg, #30353b, #43494f);background-image:-o-linear-gradient(280deg, #30353b, #43494f);background-image:linear-gradient(280deg, #30353b, #43494f);border-left:1px solid transparent;}
+.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{border-left:1px solid #52575c;border-right:1px solid #2e3134;border-top:none;border-bottom:none;background-color:#52575c;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#757c82), color-stop(70%, #52575c), to(#52575c));background-image:-webkit-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:-moz-linear-gradient(top, #757c82, #52575c 70%, #52575c);background-image:-o-linear-gradient(#757c82, #52575c 70%, #52575c);background-image:linear-gradient(#757c82, #52575c 70%, #52575c);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff757c82', endColorstr='#ff52575c', GradientType=0);}
 .pager a{border:1px solid transparent;-webkit-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';-moz-box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';box-shadow:'0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)';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);}
 .pager a:hover{background-color:#3a3f44;background-repeat:repeat-x;background-image:-moz-linear-gradient(280deg, #272b30, #3a3f44);background-image:-webkit-linear-gradient(280deg, #272b30, #3a3f44);background-image:-o-linear-gradient(280deg, #272b30, #3a3f44);background-image:linear-gradient(280deg, #272b30, #3a3f44);border:1px solid transparent;}
 .pager .disabled a,.pager .disabled a:hover{background-color:transparent;}
diff --git a/slate/bootswatch.less b/slate/bootswatch.less
index 0d8f5655..cb39ec81 100755
--- a/slate/bootswatch.less
+++ b/slate/bootswatch.less
@@ -283,7 +283,8 @@ div.subnav {
 		.box-shadow(none);
 	}
 
-	ul > li > a {
+	ul > li > a,
+	ul > li > span {
 		border-left: 1px solid @gray;
 		border-right: 1px solid darken(@gray, 15%);
 		border-top: none;
@@ -300,16 +301,20 @@ div.subnav {
 		}
 	}
 
-	ul > li.active > a,
-	ul > li.active > a:hover {
+	ul > .active > a,
+	ul > .active > a:hover,
+	ul > .active > span,
+	ul > .active > span:hover {
 		color: @grayLighter;
 		background-color: @grayDark;
 		#gradient > .directional(lighten(@grayDarker, 4%), lighten(@grayDark, 4%), 280deg);
 		border-left: 1px solid transparent;
 	}
 
-	ul > li.disabled > a,
-	ul > li.disabled > a:hover {
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
 		border-left: 1px solid @gray;
 		border-right: 1px solid darken(@gray, 15%);
 		border-top: none;
diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css
index 98f47bd3..1753bee6 100644
--- a/spruce/bootstrap.css
+++ b/spruce/bootstrap.css
@@ -5156,20 +5156,25 @@ div.subnav.subnav-fixed {
   -moz-box-shadow: none;
   box-shadow: none;
 }
-.pagination ul > li > a {
+.pagination ul > li > a,
+.pagination ul > li > span {
   color: #ebd90b;
   border-color: transparent;
 }
-.pagination ul > li > a:hover {
+.pagination ul > li > a:hover,
+.pagination ul > li > span:hover {
   color: #ebd90b;
   background-color: rgba(0, 0, 0, 0.1);
 }
-.pagination ul > .active > a {
+.pagination ul > .active > a,
+.pagination ul > .active > span {
   color: #f5f3dc;
   background-color: rgba(0, 0, 0, 0.1);
 }
 .pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover {
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > span:hover {
   color: #01584c;
 }
 .pager a {
diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css
index 58c45069..6668aafc 100644
--- a/spruce/bootstrap.min.css
+++ b/spruce/bootstrap.min.css
@@ -872,9 +872,9 @@ div.subnav.subnav-fixed{top:50px;}
 .breadcrumb li .divider{color:#f5f3dc;}
 .breadcrumb .active{color:#f5f3dc;}
 .pagination ul{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.pagination ul>li>a{color:#ebd90b;border-color:transparent;}.pagination ul>li>a:hover{color:#ebd90b;background-color:rgba(0, 0, 0, 0.1);}
-.pagination ul>.active>a{color:#f5f3dc;background-color:rgba(0, 0, 0, 0.1);}
-.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#01584c;}
+.pagination ul>li>a,.pagination ul>li>span{color:#ebd90b;border-color:transparent;}.pagination ul>li>a:hover,.pagination ul>li>span:hover{color:#ebd90b;background-color:rgba(0, 0, 0, 0.1);}
+.pagination ul>.active>a,.pagination ul>.active>span{color:#f5f3dc;background-color:rgba(0, 0, 0, 0.1);}
+.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{color:#01584c;}
 .pager a{border:none;background-color:#748C73;}.pager a:hover{background-color:#687D67;}
 .pager .disabled a,.pager .disabled a:hover{background-color:#748C73;color:#013435;}
 .btn{font-family:'Josefin Slab',serif;font-weight:700;text-shadow:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
index f0451bc9..0e14cf8d 100755
--- a/spruce/bootswatch.less
+++ b/spruce/bootswatch.less
@@ -350,7 +350,8 @@ div.subnav {
 		.box-shadow(none);
 	}
 
-	ul > li > a {
+	ul > li > a,
+	ul > li > span {
 		color: @yellow;
 		border-color: transparent;
 
@@ -360,13 +361,16 @@ div.subnav {
 		}
 	}
 
-	ul > .active > a {
+	ul > .active > a,
+	ul > .active > span {
 		color: @headingsColor;
 		background-color: rgba(0, 0, 0, 0.1);
 	}
 
 	ul > .disabled > a,
-	ul > .disabled > a:hover {
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
 		color: @blue;
 	}
 }
diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css
index 24ff2873..a73d2501 100644
--- a/superhero/bootstrap.css
+++ b/superhero/bootstrap.css
@@ -5170,20 +5170,25 @@ div.subnav .nav > .active > a:hover .caret {
   background-image: none;
   border-color: transparent;
 }
-.pagination li > a {
+.pagination ul > li > a,
+.pagination ul > li > span {
   border: none;
   color: #ece9d7;
 }
-.pagination li.active > a,
-.pagination li.active > a:hover {
+.pagination ul > li > a:hover {
+  background: #5a6a7d;
+}
+.pagination ul > .active > a,
+.pagination ul > .active > a:hover,
+.pagination ul > .active > span,
+.pagination ul > .active > span:hover {
   background-color: #e36b23;
   color: #ffffff;
 }
-.pagination li > a:hover {
-  background: #5a6a7d;
-}
-.pagination li.disabled > a,
-.pagination li.disabled > a:hover {
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > span:hover {
   background: #3a4450;
 }
 .pager a {
diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css
index 6a6a0bf0..5d467b25 100644
--- a/superhero/bootstrap.min.css
+++ b/superhero/bootstrap.min.css
@@ -874,10 +874,10 @@ div.subnav .nav>.active>a .caret,div.subnav .nav>.active>a:hover .caret{border-t
 .breadcrumb{background-color:#45515f;background-image:none;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.breadcrumb li{text-shadow:none;}
 .breadcrumb .divider{color:#ece9d7;}
 .pagination ul{background-image:none;border-color:transparent;}
-.pagination li>a{border:none;color:#ece9d7;}
-.pagination li.active>a,.pagination li.active>a:hover{background-color:#e36b23;color:#ffffff;}
-.pagination li>a:hover{background:#5a6a7d;}
-.pagination li.disabled>a,.pagination li.disabled>a:hover{background:#3a4450;}
+.pagination ul>li>a,.pagination ul>li>span{border:none;color:#ece9d7;}
+.pagination ul>li>a:hover{background:#5a6a7d;}
+.pagination ul>.active>a,.pagination ul>.active>a:hover,.pagination ul>.active>span,.pagination ul>.active>span:hover{background-color:#e36b23;color:#ffffff;}
+.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background:#3a4450;}
 .pager a{color:#ece9d7;background-color:#45515f;border-color:transparent;}.pager a:hover{background:#5a6a7d;}
 .pager .disabled a,.pager .disabled a:hover{background-color:#45515f;}
 .btn,.btn:hover{text-shadow:none;background-image:none;-webkit-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);-moz-box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);box-shadow:-2px 2px 0 rgba(0, 0, 0, 0.2);border:none;}
diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less
index eedb71cd..df0fc60c 100755
--- a/superhero/bootswatch.less
+++ b/superhero/bootswatch.less
@@ -339,23 +339,28 @@ div.subnav {
 		border-color: transparent;
 	}
 
-	li > a {
+	ul > li > a,
+	ul > li > span {
 		border: none;
 		color: @textColor;
 	}
 
-	li.active > a,
-	li.active > a:hover {
-		background-color: @orange;
-		color: @white;
+	ul > li > a:hover {
+		background: lighten(@blue, 10%);
 	}
 
-	li > a:hover {
-		background: lighten(@blue, 10%);
+	ul > .active > a,
+	ul > .active > a:hover,
+	ul > .active > span,
+	ul > .active > span:hover {
+		background-color: @orange;
+		color: @white;
 	}
 
-	li.disabled > a,
-	li.disabled > a:hover {
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
 		background: darken(@blue, 5%);
 	}
 }