From 127e1f57e4799c52613d7c30d3d79467aa59ba32 Mon Sep 17 00:00:00 2001
From: Thomas Park <thomas@thomaspark.me>
Date: Wed, 24 Oct 2012 10:14:32 -0400
Subject: all: fixes pagination issues, closes #37

---
 spruce/bootstrap.css     | 13 +++++++++----
 spruce/bootstrap.min.css |  6 +++---
 spruce/bootswatch.less   | 10 +++++++---
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'spruce')

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;
 	}
 }
-- 
cgit v1.2.3