From 06f5629dfb0713c2cefcc1fb01e77217e12549eb Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 1 Aug 2023 10:34:19 +0100 Subject: [PATCH] [4.4] Fix minor UI issues caused by bootstrap 5.3 version bump (#41286) * Fix missing variable maps in atum * Fix color on login page * Fix codestyle --- .../administrator/atum/scss/_maps-atum.scss | 14 ++++++++++++++ .../administrator/atum/scss/_variables.scss | 4 ++-- .../administrator/atum/scss/blocks/_login.scss | 1 + .../administrator/atum/scss/template.scss | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 build/media_source/templates/administrator/atum/scss/_maps-atum.scss diff --git a/build/media_source/templates/administrator/atum/scss/_maps-atum.scss b/build/media_source/templates/administrator/atum/scss/_maps-atum.scss new file mode 100644 index 0000000000000..be94436782186 --- /dev/null +++ b/build/media_source/templates/administrator/atum/scss/_maps-atum.scss @@ -0,0 +1,14 @@ +$theme-colors-text: map-merge(( + "action": shade-color($base-color, 60%), + "error": shade-color($red-dark, 60%) +), $theme-colors-text); + +$theme-colors-bg-subtle: map-merge(( + "action": tint-color($base-color, 80%), + "error": tint-color($red-dark, 80%) +), $theme-colors-bg-subtle); + +$theme-colors-border-subtle: map-merge(( + "action": tint-color($base-color, 60%), + "error": tint-color($red-dark, 60%) +), $theme-colors-border-subtle); diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index b5e44538c5914..0eb1b003284a0 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -53,8 +53,7 @@ $theme-colors: ( "light": $gray-100, "dark": $gray-900, "action": $base-color, - "error": $red-dark, - "alert-success": $green-dark) !default; + "error": $red-dark) !default; $atum-colors: ( template-sidebar-bg: var(--template-bg-dark-80), @@ -63,6 +62,7 @@ $atum-colors: ( template-bg-light: #f0f4fb, //light background color, frontend dashboard background template-link-color: var(--link-color), template-text-light: $white, + template-text-dark: $atum-text-dark, template-special-color: $dark-blue, template-contrast: $light-blue, template-bg-dark: hsl(var(--hue), 40%, 20%), diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss index 3dd6613e7ef52..0a15600c4a365 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_login.scss @@ -163,6 +163,7 @@ align-self: flex-end; width: 100%; font-size: ($font-size-base * .875); + --body-color: var(--template-text-light); color: var(--template-text-light); text-align: center; diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/build/media_source/templates/administrator/atum/scss/template.scss index 7b29f6404068a..713d590ec27fb 100644 --- a/build/media_source/templates/administrator/atum/scss/template.scss +++ b/build/media_source/templates/administrator/atum/scss/template.scss @@ -7,6 +7,7 @@ @import "../../../../../../media/vendor/bootstrap/scss/variables"; @import "../../../../../../media/vendor/bootstrap/scss/variables-dark"; @import "../../../../../../media/vendor/bootstrap/scss/maps"; +@import "maps-atum"; @import "../../../../../../media/vendor/bootstrap/scss/mixins"; @import "../../../../../../media/vendor/bootstrap/scss/utilities";