all: fixes pagination issues, closes #37

3 files changed, 25 insertions, 14 deletions

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;