all: fixes pagination issues, closes #37

3 files changed, 34 insertions, 25 deletions

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 {