1 files changed, 25 insertions, 32 deletions

diff --git a/assets/stylesheets/bootstrap/_pagination.scss b/assets/stylesheets/bootstrap/_pagination.scss
index fb23f91..a52b9d1 100644
--- a/assets/stylesheets/bootstrap/_pagination.scss
+++ b/assets/stylesheets/bootstrap/_pagination.scss
@@ -1,46 +1,43 @@
-//
-// Pagination (multiple pages)
-// --------------------------------------------------
 .pagination {
   display: inline-block;
   padding-left: 0;
-  margin: $line-height-computed 0;
-  border-radius: $border-radius-base;
+  margin-top: $spacer-y;
+  margin-bottom: $spacer-y;
+  @include border-radius();
 
   > li {
     display: inline; // Remove list-style and block-level defaults
+
     > a,
     > span {
       position: relative;
       float: left; // Collapse white-space
-      padding: $padding-base-vertical $padding-base-horizontal;
-      line-height: $line-height-base;
-      text-decoration: none;
+      padding: $pagination-padding-y $pagination-padding-x;
+      margin-left: -1px;
+      line-height: $line-height;
       color: $pagination-color;
+      text-decoration: none;
       background-color: $pagination-bg;
       border: 1px solid $pagination-border;
-      margin-left: -1px;
     }
     &:first-child {
       > a,
       > span {
         margin-left: 0;
-        @include border-left-radius($border-radius-base);
+        @include border-left-radius($border-radius);
       }
     }
     &:last-child {
       > a,
       > span {
-        @include border-right-radius($border-radius-base);
+        @include border-right-radius($border-radius);
       }
     }
   }
 
   > li > a,
   > li > span {
-    &:hover,
-    &:focus {
-      z-index: 3;
+    @include hover-focus {
       color: $pagination-hover-color;
       background-color: $pagination-hover-bg;
       border-color: $pagination-hover-border;
@@ -49,41 +46,37 @@
 
   > .active > a,
   > .active > span {
-    &,
-    &:hover,
-    &:focus {
+    @include plain-hover-focus {
       z-index: 2;
       color: $pagination-active-color;
+      cursor: default;
       background-color: $pagination-active-bg;
       border-color: $pagination-active-border;
-      cursor: default;
     }
   }
 
   > .disabled {
     > span,
-    > span:hover,
-    > span:focus,
-    > a,
-    > a:hover,
-    > a:focus {
-      color: $pagination-disabled-color;
-      background-color: $pagination-disabled-bg;
-      border-color: $pagination-disabled-border;
-      cursor: $cursor-disabled;
+    > a {
+      @include plain-hover-focus {
+        color: $pagination-disabled-color;
+        cursor: $cursor-disabled;
+        background-color: $pagination-disabled-bg;
+        border-color: $pagination-disabled-border;
+      }
     }
   }
 }
 
+
+//
 // Sizing
-// --------------------------------------------------
+//
 
-// Large
 .pagination-lg {
-  @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
+  @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $line-height-lg, $border-radius-lg);
 }
 
-// Small
 .pagination-sm {
-  @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
+  @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $line-height-sm, $border-radius-sm);
 }