all: fixes pagination issues, closes #37

3 files changed, 30 insertions, 14 deletions

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);
 	}
 }