aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-11-14 22:51:18 -0800
committerChris Rebert <[email protected]>2015-11-14 22:51:18 -0800
commit5f45f652f72e91046e3ac7497a1dffde89ff6393 (patch)
tree1b8d847e3c6b383f58af41bc2af878520a0a9e86
parent687610e6f133dfd13078ebd87434b6efb6cd3742 (diff)
downloadbootstrap-5f45f652f72e91046e3ac7497a1dffde89ff6393.tar.xz
bootstrap-5f45f652f72e91046e3ac7497a1dffde89ff6393.zip
Rename $pagination-border => $pagination-border-color for clarity
-rw-r--r--scss/_pagination.scss2
-rw-r--r--scss/_variables.scss4
2 files changed, 3 insertions, 3 deletions
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index a52b9d1e2..124e14acf 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -18,7 +18,7 @@
color: $pagination-color;
text-decoration: none;
background-color: $pagination-bg;
- border: 1px solid $pagination-border;
+ border: 1px solid $pagination-border-color;
}
&:first-child {
> a,
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 5882597a0..6f5283faf 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -393,7 +393,7 @@ $pagination-padding-y-lg: .75rem !default;
$pagination-color: $link-color !default;
$pagination-bg: #fff !default;
-$pagination-border: #ddd !default;
+$pagination-border-color: #ddd !default;
$pagination-hover-color: $link-hover-color !default;
$pagination-hover-bg: $gray-lighter !default;
@@ -412,7 +412,7 @@ $pagination-disabled-border: #ddd !default;
$pager-bg: $pagination-bg !default;
$pager-border-width: $border-width !default;
-$pager-border-color: $pagination-border !default;
+$pager-border-color: $pagination-border-color !default;
$pager-border-radius: 15px !default;
$pager-hover-bg: $pagination-hover-bg !default;