From f8abb476fe0475799a3da66d49a92c7de2ace8a0 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Fri, 25 Sep 2020 16:08:43 +0000 Subject: [IMP] web_editor, *: automatically increase default link color contrast *: website Inside a color combination (or outside, as considered the same as inside color combination number 1), the link color can be configured. It is set by themes to one of the 5 theme colors. Sometimes, no color of those 5 colors contrast enough with the color combination's background and we accepted that before, relying on the fact the user can change the link color if he wants too. Now we automatically increase the contrast of those link colors, except if the user overrides it. This system might be extended to all foreground colors in the future but the system has to be improved for that. closes odoo/odoo#58538 Signed-off-by: Quentin Smetz (qsm) --- addons/web_editor/static/src/scss/web_editor.common.scss | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'addons/web_editor/static/src/scss/web_editor.common.scss') diff --git a/addons/web_editor/static/src/scss/web_editor.common.scss b/addons/web_editor/static/src/scss/web_editor.common.scss index a2981937e27..e4e0a6f48d2 100644 --- a/addons/web_editor/static/src/scss/web_editor.common.scss +++ b/addons/web_editor/static/src/scss/web_editor.common.scss @@ -10,6 +10,8 @@ // Most of the keys of the color combination color should be null. We have // to indicate their fallback values. @for $index from 1 through length($o-color-combinations) { + $-bg-color: o-color(color('o-cc#{$index}-bg')); + $-text: color('o-cc#{$index}-text') or color-yiq(o-color('o-cc#{$index}-bg')); $-headings: color('o-cc#{$index}-headings') or $-text; $-h2: color('o-cc#{$index}-h2') or $-headings; @@ -40,9 +42,9 @@ @include print-variable('o-cc#{$index}-h6', $-h6); } - @if not color('o-cc#{$index}-link') { - @include print-variable('o-cc#{$index}-link', theme-color('primary')); - } + $-link: color('o-cc#{$index}-link'); + $-link-color: if($-link, o-color($-link), theme-color('primary')); + @include print-variable('o-cc#{$index}-link', auto-contrast($-link-color, $-bg-color, 'o-cc#{$index}-link')); $-btn-primary: color('o-cc#{$index}-btn-primary'); @if not $-btn-primary { @@ -644,7 +646,8 @@ blockquote { // bg and text utility classes. ** .o_cc#{$index} { // Background & Text - @include o-bg-color(o-color($-bg), o-color($-text), $important: false, $yiq-min-opacity-threshold: 0); + $-bg-color: o-color($-bg); + @include o-bg-color($-bg-color, o-color($-text), $important: false, $yiq-min-opacity-threshold: 0); #{$o-color-extras-nesting-selector} { // Headings @@ -672,10 +675,10 @@ blockquote { $-link-color: if($-link, o-color($-link), theme-color('primary')); $-link-hover-color: darken($-link-color, 15%); a:not(.btn), .btn-link { - color: $-link-color; + color: auto-contrast($-link-color, $-bg-color, 'o-cc#{$index}-link'); @include hover { - color: $-link-hover-color; + color: auto-contrast($-link-hover-color, $-bg-color, 'o-cc#{$index}-link'); } } -- cgit v1.2.3