summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-11 18:23:41 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-11 18:23:41 +0000
commit1dbb20d95eb6843fe903cbc875440226c1cee20d (patch)
treeca607448e58a1ec588c44082444510cd64c29dc5
parentc9a7c80a6f0c2919cf0a143d783fd4b4dd4fde61 (diff)
parentf8693f2cb48be2d9171b03cfa4ddb5ded00e7632 (diff)
downloadgitlab-ce-1dbb20d95eb6843fe903cbc875440226c1cee20d.tar.gz
Merge branch '46708-page-numbers' into 'master'
Resolve "Fix color of page numbers" Closes #46708 See merge request gitlab-org/gitlab-ce!19599
-rw-r--r--app/assets/stylesheets/framework/pagination.scss8
-rw-r--r--app/assets/stylesheets/framework/variables.scss16
2 files changed, 24 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/pagination.scss b/app/assets/stylesheets/framework/pagination.scss
index 50a1b1c446d..61d02511ff4 100644
--- a/app/assets/stylesheets/framework/pagination.scss
+++ b/app/assets/stylesheets/framework/pagination.scss
@@ -4,3 +4,11 @@
text-decoration: none;
}
}
+
+.page-item {
+ &.active {
+ .page-link {
+ z-index: 3;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 497261f938f..63328b34edc 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -435,6 +435,22 @@ $badge-bg: rgba(0, 0, 0, 0.07);
$badge-color: $gl-text-color-secondary;
/*
+* Pagination
+*/
+$pagination-padding-y: 6px;
+$pagination-padding-x: 16px;
+$pagination-line-height: 20px;
+$pagination-border-color: $border-color;
+$pagination-active-bg: $blue-600;
+$pagination-active-border-color: $blue-600;
+$pagination-hover-bg: $blue-50;
+$pagination-hover-border-color: $border-color;
+$pagination-hover-color: $gl-text-color;
+$pagination-disabled-color: #cdcdcd;
+$pagination-disabled-bg: $gray-light;
+$pagination-disabled-border-color: $border-color;
+
+/*
* Status icons
*/
$status-icon-size: 22px;