From 7054f273cf5d74f5a36771dca9152cb1f15a8100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= Date: Tue, 21 Jul 2020 11:33:34 +0200 Subject: [PATCH] fix(cards): .card-footer's bottom padding --- scss/_card.scss | 2 +- scss/_pagination.scss | 19 +++++++++++-------- scss/_variables.scss | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/scss/_card.scss b/scss/_card.scss index bbe31d1468..f0efd434ca 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -98,7 +98,7 @@ .card-footer { // Boosted mod - padding: 0 $card-cap-padding-x $card-cap-padding-y; + padding: 0 $card-cap-padding-x $card-cap-padding-x; font-weight: $font-weight-bold; color: $card-footer-color; background-color: $card-cap-color; diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 347885b2e1..9e0538fb7f 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -35,10 +35,10 @@ } &:active { - color: $pagination-active-color; + color: color-contrast($pagination-active-item-bg); background-color: $pagination-active-item-bg; - border-color: $pagination-active-item-border-color; - outline-color: $pagination-active-item-border-color; // Boosted mod + border-color: $pagination-active-item-border; + outline-color: $pagination-active-item-border; // Boosted mod } // Boosted mod @@ -93,17 +93,20 @@ background-color: $pagination-hover-color; border-color: $pagination-hover-color; outline-color: $pagination-hover-color; // Boosted mod + + &::before { + background-image: escape-svg($pagination-icon-hover); + } } &:active { color: color-contrast($pagination-active-item-bg); background-color: $pagination-active-item-bg; - border-color: $pagination-active-item-border-color; - } + border-color: $pagination-active-item-border; - &:hover::before, - &:focus::before { - background-image: escape-svg($pagination-icon-hover); + &::before { + background-image: escape-svg($pagination-icon); + } } &.has-label { diff --git a/scss/_variables.scss b/scss/_variables.scss index 3de8598805..c646bb9b94 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1020,8 +1020,8 @@ $pagination-disabled-border-color: $pagination-disabled-color !default; // Boosted mod $pagination-padding-end: 1.125rem !default; $pagination-item-size: $spacer * 2 !default; -$pagination-active-item-bg: $orange !default; -$pagination-active-item-border-color: $pagination-active-item-bg !default; +$pagination-active-item-bg: $primary !default; +$pagination-active-item-border: $pagination-active-item-bg !default; $pagination-icon: $chevron-icon !default; $pagination-icon-hover: $chevron-icon-hover !default; $pagination-icon-margin: .1875rem !default;