From 8aebb79237d101abadb4234446235555f50fb465 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 11 Jan 2023 14:01:15 +0000 Subject: [PATCH] [IMP] odoo_theme: Fix alerts and accordions colors closes odoo/documentation#3315 Signed-off-by: Antoine Vandevenne (anv) --- extensions/odoo_theme/static/scss/_variables.scss | 9 --------- .../odoo_theme/static/scss/bootstrap_overridden.scss | 6 ++---- extensions/odoo_theme/static/style.scss | 12 ++++++------ 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss index 69ae4508b..4de50eeb0 100644 --- a/extensions/odoo_theme/static/scss/_variables.scss +++ b/extensions/odoo_theme/static/scss/_variables.scss @@ -118,15 +118,6 @@ $o-literals-border: $o-literals-bg; $o-toc-bg: $o-gray-bg; $o-toc-border: $o-toc-bg; -$o-alert-note-color: $primary; -$o-alert-tip-color: $primary; -$o-alert-example-color: $success; -$o-alert-warning-color: $success; -$o-alert-danger-color: $danger; -$o-alert-exercises-color: $dark; - -$o-accordion-bg: $o-alert-exercises-color!default; - //------------------------------------------------------------------------------ // Misc //------------------------------------------------------------------------------ diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss index 7a51b62cd..c7fc2d232 100644 --- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss +++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss @@ -89,12 +89,12 @@ $modal-xl: fit-content; // Accordion $accordion-body-padding-y: 0 !default; $accordion-body-padding-x: 0 !default; -$accordion-color: shade-color($gray-200, 60%) !default; +$accordion-color: $dark !default; $accordion-bg: $gray-200; $accordion-button-color: $accordion-color !default; $accordion-button-active-color: $accordion-button-color !default; -$accordion-button-bg: $accordion-bg !default; +$accordion-button-bg: transparent; $accordion-button-active-bg: $accordion-button-bg !default; $accordion-button-focus-box-shadow: transparent; $accordion-icon-transform: rotate(0deg) !default; @@ -103,5 +103,3 @@ $accordion-icon-transform: rotate(0deg) !default; $alert-border-width: 3px; $alert-border-scale: 0; $alert-border-radius: 0 3px 3px 0; -$alert-bg-scale: -87%; -$alert-color-scale: 40%; diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 78c0948ba..a7973ee3b 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -993,9 +993,9 @@ header { // Exercises &.alert-dark { --o-alert-icon: '#{$i-exercise}'; - --o-alert-code-border-color: #{tint-color($dark, 50%)}; + --o-alert-code-border-color: $dark; - background: $gray-300; + background: $gray-200; } } } @@ -1006,12 +1006,12 @@ header { //------------------------------------------------------------------------------ .o_spoiler { - $background: shift-color($o-accordion-bg, $alert-bg-scale); - $border: shift-color($o-accordion-bg, $alert-border-scale); - $color: shift-color($o-accordion-bg, $alert-color-scale); + $background: $gray-200; + $border: shift-color($accordion-color, $alert-border-scale); + $color: shift-color($accordion-color, $alert-color-scale); @if (contrast-ratio($background, $color) < $min-contrast-ratio) { - $color: mix($o-accordion-bg, color-contrast($background), abs($alert-color-scale)); + $color: mix($dark, color-contrast($background), abs($alert-color-scale)); } @include alert-variant($background, $border, $color);