diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-11 18:23:41 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-12 11:39:20 +0200 |
| commit | 4f516ed00d775ebc5d507b89b8d661de1aadc466 (patch) | |
| tree | 54d7a14d51d5a9b91762bceb29adfc569471ab56 | |
| parent | f7801aa2c9dd82576e11a4b886b68df3d76964cc (diff) | |
| download | gitlab-ce-4f516ed00d775ebc5d507b89b8d661de1aadc466.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.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 16 |
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; |