From 176394ec6adfb200656b69823c6643e550d905c8 Mon Sep 17 00:00:00 2001 From: astridx Date: Tue, 14 Apr 2020 10:18:58 +0200 Subject: [PATCH 1/2] draft --- .../atum/images/select-bg-light-rtl.svg | 1 + .../templates/atum/images/select-bg-light.svg | 1 + .../templates/atum/scss/_variables.scss | 4 ++++ .../scss/vendor/bootstrap/_custom-forms.scss | 16 ++++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 administrator/templates/atum/images/select-bg-light-rtl.svg create mode 100644 administrator/templates/atum/images/select-bg-light.svg diff --git a/administrator/templates/atum/images/select-bg-light-rtl.svg b/administrator/templates/atum/images/select-bg-light-rtl.svg new file mode 100644 index 0000000000000..6840f232861a2 --- /dev/null +++ b/administrator/templates/atum/images/select-bg-light-rtl.svg @@ -0,0 +1 @@ + diff --git a/administrator/templates/atum/images/select-bg-light.svg b/administrator/templates/atum/images/select-bg-light.svg new file mode 100644 index 0000000000000..d0b83ba6b1e55 --- /dev/null +++ b/administrator/templates/atum/images/select-bg-light.svg @@ -0,0 +1 @@ + diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index fa0803f98da55..b9e904852c548 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -220,11 +220,15 @@ $custom-select-indicator-padding: 3rem; $custom-select-bg: var(--atum-bg-light); $custom-select-bg-size: 116rem; $custom-select-indicator: url(../images/select-bg.svg); +$custom-select-indicator-light: url(../images/select-bg-light.svg); $custom-select-indicator-rtl: url(../images/select-bg-rtl.svg); +$custom-select-indicator-light-rtl: url(../images/select-bg-light-rtl.svg); $custom-select-indicator-active: url(../../../images/select-bg.svg); $custom-select-indicator-active-rtl: url(../../../images/select-bg-rtl.svg); $custom-select-background: $custom-select-indicator no-repeat right center / $custom-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) +$custom-select-background-light: $custom-select-indicator-light no-repeat right center / $custom-select-bg-size; $custom-select-background-rtl: $custom-select-indicator-rtl no-repeat left center / $custom-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) +$custom-select-background-light-rtl: $custom-select-indicator-light-rtl no-repeat left center / $custom-select-bg-size; $custom-select-box-shadow: $atum-box-shadow; $custom-select-bg-size-sm: 75rem; $custom-select-multiple-padding-y: .3rem; diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss b/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss index de755e145c051..4e0e2b4c0760d 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -36,10 +36,18 @@ &.custom-select-color-state { &.custom-select-success { + background: $custom-select-background-light; color: theme-color("success"); background-color: theme-color("success"); border-color: theme-color("success"); + [dir=rtl] & { + background: $custom-select-background-light-rtl; + color: theme-color("success"); + background-color: theme-color("success"); + border-color: theme-color("success"); + } + option { color: $custom-select-color; background-color: var(--white-offset); @@ -47,10 +55,18 @@ } &.custom-select-danger { + background: $custom-select-background-light; color: theme-color("danger"); background-color: theme-color("danger"); border-color: theme-color("danger"); + [dir=rtl] & { + background: $custom-select-background-light-rtl; + color: theme-color("danger"); + background-color: theme-color("danger"); + border-color: theme-color("danger"); + } + option { color: $custom-select-color; background-color: var(--white-offset); From ad4095ee406751b53fbe806960ba40745cd59a7c Mon Sep 17 00:00:00 2001 From: astridx Date: Tue, 14 Apr 2020 10:20:48 +0200 Subject: [PATCH 2/2] draft --- administrator/templates/atum/scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index b9e904852c548..f91f848ed41ee 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -226,7 +226,7 @@ $custom-select-indicator-light-rtl: url(../images/select-bg-light-rtl.svg); $custom-select-indicator-active: url(../../../images/select-bg.svg); $custom-select-indicator-active-rtl: url(../../../images/select-bg-rtl.svg); $custom-select-background: $custom-select-indicator no-repeat right center / $custom-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) -$custom-select-background-light: $custom-select-indicator-light no-repeat right center / $custom-select-bg-size; +$custom-select-background-light: $custom-select-indicator-light no-repeat right center / $custom-select-bg-size; $custom-select-background-rtl: $custom-select-indicator-rtl no-repeat left center / $custom-select-bg-size; // Used so we can have multiple background elements (e.g., arrow and feedback icon) $custom-select-background-light-rtl: $custom-select-indicator-light-rtl no-repeat left center / $custom-select-bg-size; $custom-select-box-shadow: $atum-box-shadow;