[#2399] fix pagination style

ckan · May 27, 2016 · 617de3e · 617de3e
1 parent ed2196b
commit 617de3e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 44 deletions.
diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css
@@ -5560,9 +5560,6 @@ a.tag:hover {
 .js .tab-content.active {
   display: block;
 }
-.js .automatic-local-datetime {
-    display: none;
-}
 .box {
   background-color: #FFF;
   border: 1px solid #cccccc;
@@ -5633,11 +5630,6 @@ a.tag:hover {
   font-weight: bold;
   color: #000000;
 }
-.module .pagination {
-  height: 34px;
-  margin-bottom: 0;
-  border-top: 1px solid #dddddd;
-}
 .module-content .pagination {
   margin-left: -25px;
   margin-right: -25px;
@@ -5653,8 +5645,8 @@ a.tag:hover {
   border: 0;
 }
 .module .pagination li a {
-  border-top: none;
-  border-bottom: none;
+  border-top: 1px solid #dddddd;
+  border-bottom: 1px solid #dddddd;
   padding-top: 7px;
   padding-bottom: 7px;
 }
@@ -5664,16 +5656,6 @@ a.tag:hover {
   -moz-border-radius: 0;
   border-radius: 0;
 }
-.module .pagination li:first-child a {
-  border-left-width: 0;
-}
-.module .pagination li:last-child a {
-  border-right-width: 0;
-}
-.module .pagination li.active a {
-  border-left-width: 1px;
-  border-right-width: 1px;
-}
 .module-content-shallow {
   padding: 0;
   margin-top: 10px;
@@ -8398,9 +8380,15 @@ h4 small {
   padding: 0 10px;
   line-height: 31px;
 }
-.account-masthead .account ul li a span.username {
+.account-masthead .account ul li a span.username,
+.account-masthead .account ul li a span.text {
   margin: 0 2px 0 4px;
 }
+.account-masthead .account ul li a span.text {
+  position: absolute;
+  top: -9999px;
+  left: -9999px;
+}
 .account-masthead .account ul li a:hover {
   color: #d9e7eb;
   background-color: #00232e;
@@ -8413,20 +8401,22 @@ h4 small {
   vertical-align: 1px;
   margin-left: 3px;
 }
-.account-masthead .account .notifications a span {
+.account-masthead .account .notifications a span.badge {
   font-size: 12px;
   margin-left: 3px;
   padding: 1px 6px;
   background-color: #00232e;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
+  text-shadow: none;
+  color: #bfd7de;
 }
 .account-masthead .account .notifications a:hover span {
   color: #ffffff;
   background-color: #000f14;
 }
-.account-masthead .account .notifications.notifications-important a span {
+.account-masthead .account .notifications.notifications-important a span.badge {
   color: #ffffff;
   background-color: #c9403a;
 }

diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less
@@ -57,12 +57,6 @@
   color: @layoutBoldColor;
 }
 
-.module .pagination {
-  height: 34px;
-  margin-bottom: 0;
-  border-top: 1px solid @moduleHeadingBorderColor;
-}
-
 .module-content .pagination {
   margin-left: -25px;
   margin-right: -25px;
@@ -76,8 +70,8 @@
 }
 
 .module .pagination li a {
-  border-top: none;
-  border-bottom: none;
+  border-top: 1px solid @moduleHeadingBorderColor;;
+  border-bottom: 1px solid @moduleHeadingBorderColor;;
   padding-top: 7px;
   padding-bottom: 7px;
 }
@@ -87,19 +81,6 @@
   .border-radius(0);
 }
 
-.module .pagination li:first-child a {
-  border-left-width: 0;
-}
-
-.module .pagination li:last-child a {
-  border-right-width: 0;
-}
-
-.module .pagination li.active a {
-  border-left-width: 1px;
-  border-right-width: 1px;
-}
-
 .module-content-shallow {
   padding: 0;
   margin-top: 10px;