From ea80fa7184a5d1203ca50e6787e4f29abf86d2d0 Mon Sep 17 00:00:00 2001 From: catenglaender <59924129+catenglaender@users.noreply.github.com> Date: Thu, 29 Aug 2024 09:35:55 +0200 Subject: [PATCH] UI/setting mainbar colors (#8001) --- templates/default/010-settings/_index.scss | 5 +++-- .../default/010-settings/_settings_mainbar.scss | 14 ++++++++++++++ .../MainControls/_ui-component_mainbar.scss | 14 +------------- templates/default/delos.css | 1 + 4 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 templates/default/010-settings/_settings_mainbar.scss diff --git a/templates/default/010-settings/_index.scss b/templates/default/010-settings/_index.scss index c91ba89c87f5..5317788185bf 100644 --- a/templates/default/010-settings/_index.scss +++ b/templates/default/010-settings/_index.scss @@ -10,8 +10,9 @@ @forward "./settings_typography"; @forward "./settings_borders"; @forward "./settings_button"; -@forward "./settings_footer"; +@forward "./settings_footer"; @forward "./settings_header"; @forward "./settings_layout"; +@forward "./settings_mainbar"; @forward "./settings_media"; -@forward "./settings_shadows"; \ No newline at end of file +@forward "./settings_shadows"; diff --git a/templates/default/010-settings/_settings_mainbar.scss b/templates/default/010-settings/_settings_mainbar.scss new file mode 100644 index 000000000000..48f43f218711 --- /dev/null +++ b/templates/default/010-settings/_settings_mainbar.scss @@ -0,0 +1,14 @@ +@use "./settings_color-palette" as s; + +$il-mainbar-btn-color: s.$il-main-bg !default; +$il-mainbar-btn-bg-color: s.$il-neutral-color !default; + +$il-mainbar-btn-color-hover: s.$il-neutral-color !default; +$il-mainbar-btn-bg-color-hover: s.$il-main-bg !default; + +$il-mainbar-btn-color-engaged: s.$il-neutral-color !default; +$il-mainbar-btn-bg-color-engaged: s.$il-main-bg !default; + +$il-mainbar-btn-icon-filter: brightness(0) invert(1) !default; +$il-mainbar-btn-hover-icon-filter: invert(50%) !default; +$il-mainbar-btn-engaged-icon-filter: invert(50%) !default; diff --git a/templates/default/070-components/UI-framework/MainControls/_ui-component_mainbar.scss b/templates/default/070-components/UI-framework/MainControls/_ui-component_mainbar.scss index b6ddba42c85d..72d5bc5a60b2 100644 --- a/templates/default/070-components/UI-framework/MainControls/_ui-component_mainbar.scss +++ b/templates/default/070-components/UI-framework/MainControls/_ui-component_mainbar.scss @@ -11,19 +11,7 @@ $il-mainbar-btn-padding: 0; $il-mainbar-btn-label-icon-gap: $il-padding-xs-vertical; -$il-mainbar-btn-color: white; -$il-mainbar-btn-bg-color: $il-neutral-color; -$il-mainbar-btn-border-radius: null; - -$il-mainbar-btn-color-hover: $il-neutral-color; -$il-mainbar-btn-bg-color-hover: $il-main-bg; - -$il-mainbar-btn-color-engaged: $il-neutral-color; -$il-mainbar-btn-bg-color-engaged: $il-main-bg; - -$il-mainbar-btn-icon-filter: brightness(0) invert(1); -$il-mainbar-btn-hover-icon-filter: invert(50%); -$il-mainbar-btn-engaged-icon-filter: invert(50%); +$il-mainbar-btn-border-radius: $il-border-radius-base; $il-mainbar-btn-border: 1px solid $il-standard-page-border-light-color; $il-mainbar-btn-label-size: $il-font-size-xsmall; diff --git a/templates/default/delos.css b/templates/default/delos.css index 836301b9659a..8c9b84b71f16 100644 --- a/templates/default/delos.css +++ b/templates/default/delos.css @@ -6049,6 +6049,7 @@ footer { padding: 0; border: 0; border-bottom: 1px solid #dddddd; + border-radius: 0px; flex-flow: column nowrap; justify-content: center; gap: 1px;