slate: fixes pagination disabled and within tables, closes thomaspark…

…#239
pierop · Aug 7, 2014 · 71c4ee0 · 71c4ee0
1 parent 371dee8
commit 71c4ee0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/slate/bootstrap.css b/slate/bootstrap.css
@@ -6347,9 +6347,6 @@ h6 {
 .text-info:hover {
   color: #5bc0de;
 }
-.table a:not(.btn) {
-  text-decoration: underline;
-}
 .table .success,
 .table .warning,
 .table .danger,
@@ -6468,7 +6465,8 @@ legend {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0);
   filter: none;
 }
-.pagination > li > a {
+.pagination > li > a,
+.pagination > li > span {
   text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
   background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539);
   background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539);
@@ -6477,15 +6475,17 @@ legend {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0);
   filter: none;
 }
-.pagination > li > a:hover {
+.pagination > li > a:hover,
+.pagination > li > span:hover {
   background-image: -webkit-linear-gradient(#020202, #101112 40%, #191b1d);
   background-image: -o-linear-gradient(#020202, #101112 40%, #191b1d);
   background-image: linear-gradient(#020202, #101112 40%, #191b1d);
   background-repeat: no-repeat;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff020202', endColorstr='#ff191b1d', GradientType=0);
   filter: none;
 }
-.pagination > li.active > a {
+.pagination > li.active > a,
+.pagination > li.active > span {
   background-image: -webkit-linear-gradient(#020202, #101112 40%, #191b1d);
   background-image: -o-linear-gradient(#020202, #101112 40%, #191b1d);
   background-image: linear-gradient(#020202, #101112 40%, #191b1d);
@@ -6494,7 +6494,9 @@ legend {
   filter: none;
 }
 .pagination > li.disabled > a,
-.pagination > li.disabled > a:hover {
+.pagination > li.disabled > a:hover,
+.pagination > li.disabled > span,
+.pagination > li.disabled > span:hover {
   background-color: transparent;
   background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539);
   background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539);

diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css
diff --git a/slate/bootswatch.less b/slate/bootswatch.less
@@ -148,10 +148,6 @@ h1, h2, h3, h4, h5, h6 {
 
 .table {
 
-  a:not(.btn) {
-    text-decoration: underline;
-  }
-
   .success,
   .warning,
   .danger,
@@ -289,7 +285,8 @@ legend {
 
 .pagination {
 
-  & > li > a {
+  & > li > a,
+  & > li > span {
     text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
     .btn-shadow(@btn-default-bg);
 
@@ -298,12 +295,15 @@ legend {
     }
   }
 
-  & > li.active > a {
+  & > li.active > a,
+  & > li.active > span {
     .btn-shadow-inverse(@btn-default-bg);
   }
 
   & > li.disabled > a,
-  & > li.disabled > a:hover {
+  & > li.disabled > a:hover,
+  & > li.disabled > span,
+  & > li.disabled > span:hover {
     background-color: transparent;
     .btn-shadow(@btn-default-bg);
   }