From 3c4ffd1c89c2c2d2c13932a97251aae7fda4449f Mon Sep 17 00:00:00 2001 From: Romeo Fragomeli Date: Tue, 14 Jun 2022 11:17:26 +0000 Subject: [PATCH] [REF] *: BS5: remove hover mixins usage (due to BS5 removal) * = mail, survey, web, web_editor, website, website_event, website_mail removed mixins: * hover * plain-hover-focus * hover-focus These mixins are now replaced by their CSS equivalent. Task ID: 2766483 Part-of: odoo/odoo#95450 --- addons/mail/static/src/scss/emojis.scss | 2 +- addons/survey/static/src/scss/survey_templates_results.scss | 2 +- addons/web/static/src/legacy/scss/bs_mixins_overrides.scss | 2 +- .../static/src/legacy/scss/bs_mixins_overrides_backend.scss | 4 ++-- addons/web/static/src/legacy/scss/form_view.scss | 2 +- .../web/static/src/libs/bootstrap/mixins_forwardport.scss | 2 +- addons/web_editor/static/src/scss/web_editor.common.scss | 6 +++--- addons/website/static/src/scss/website.scss | 2 +- .../website/static/src/snippets/s_mega_menu_cards/000.scss | 2 +- .../src/snippets/s_mega_menu_images_subtitles/000.scss | 2 +- .../static/src/snippets/s_mega_menu_little_icons/000.scss | 2 +- .../static/src/scss/event_templates_common.scss | 2 +- .../website_event/static/src/scss/event_templates_list.scss | 4 ++-- addons/website_mail/static/src/css/website_mail.scss | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/mail/static/src/scss/emojis.scss b/addons/mail/static/src/scss/emojis.scss index cd2897ce72a..64238a95784 100644 --- a/addons/mail/static/src/scss/emojis.scss +++ b/addons/mail/static/src/scss/emojis.scss @@ -10,7 +10,7 @@ $o-mail-emoji-height: 2rem; padding: 2px; width: $o-mail-emoji-height; height: $o-mail-emoji-height; - @include hover-focus() { + &:hover, &:focus { background-color: grey('100'); } } diff --git a/addons/survey/static/src/scss/survey_templates_results.scss b/addons/survey/static/src/scss/survey_templates_results.scss index c984279580f..e1ac7a97a5a 100644 --- a/addons/survey/static/src/scss/survey_templates_results.scss +++ b/addons/survey/static/src/scss/survey_templates_results.scss @@ -20,7 +20,7 @@ // Dropdown adapted from event templates to get a coherent styling .dropdown-toggle { text-align: left; - @include hover-focus { + &:hover, &:focus { text-decoration: none; } &:after { diff --git a/addons/web/static/src/legacy/scss/bs_mixins_overrides.scss b/addons/web/static/src/legacy/scss/bs_mixins_overrides.scss index cc7ea1d4ec2..e7db43e7b67 100644 --- a/addons/web/static/src/legacy/scss/bs_mixins_overrides.scss +++ b/addons/web/static/src/legacy/scss/bs_mixins_overrides.scss @@ -60,7 +60,7 @@ $o-color-extras-nesting-selector: '&' !default; } a#{$parent}, button#{$parent} { - @include hover-focus { + &:hover, &:focus { @include o-bg-color(darken($color, 10%), $text-color, false); } } diff --git a/addons/web/static/src/legacy/scss/bs_mixins_overrides_backend.scss b/addons/web/static/src/legacy/scss/bs_mixins_overrides_backend.scss index d00e0b59433..c479c2d95b3 100644 --- a/addons/web/static/src/legacy/scss/bs_mixins_overrides_backend.scss +++ b/addons/web/static/src/legacy/scss/bs_mixins_overrides_backend.scss @@ -40,7 +40,7 @@ } a#{$parent}, button#{$parent} { - @include hover-focus() { + &:hover, &:focus { color: darken($color-value, $-hover) !important; } } @@ -55,7 +55,7 @@ } a#{$parent}.fa-circle, button#{$parent}.fa-circle { - @include hover-focus() { + &:hover, &:focus { color: darken($color, $-hover) !important; } } diff --git a/addons/web/static/src/legacy/scss/form_view.scss b/addons/web/static/src/legacy/scss/form_view.scss index 162a0d1086a..fa722c422f4 100644 --- a/addons/web/static/src/legacy/scss/form_view.scss +++ b/addons/web/static/src/legacy/scss/form_view.scss @@ -274,7 +274,7 @@ $o-form-label-margin-right: 0px; pointer-events: none; &:not(.btn-primary) { - @include plain-hover-focus() { + &, &:hover, &:focus { color: $text-muted; } } diff --git a/addons/web/static/src/libs/bootstrap/mixins_forwardport.scss b/addons/web/static/src/libs/bootstrap/mixins_forwardport.scss index ab1fc515a80..ca2228df10b 100644 --- a/addons/web/static/src/libs/bootstrap/mixins_forwardport.scss +++ b/addons/web/static/src/libs/bootstrap/mixins_forwardport.scss @@ -14,7 +14,7 @@ } @if $emphasized-link-hover-darken-percentage != 0 { a#{$parent} { - @include hover-focus { + &:hover, &:focus { color: darken($color, $emphasized-link-hover-darken-percentage) !important; } } 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 9612f900745..4bf3a73d015 100644 --- a/addons/web_editor/static/src/scss/web_editor.common.scss +++ b/addons/web_editor/static/src/scss/web_editor.common.scss @@ -671,7 +671,7 @@ blockquote { &, h6 { // Quick fix: sometimes we use h6 in dropdowns color: $dropdown-link-color !important; - @include hover-focus { + &:hover, &:focus { color: $dropdown-link-hover-color !important; } } @@ -735,7 +735,7 @@ blockquote { a:not(.btn), .btn-link { color: auto-contrast($-link-color, $-bg-color, 'o-cc#{$index}-link'); - @include hover { + &:hover { color: auto-contrast($-link-hover-color, $-bg-color, 'o-cc#{$index}-link'); } } @@ -780,7 +780,7 @@ blockquote { @include gradient-bg($-btn-primary-color); color: color-yiq($-btn-primary-color) !important; - @include hover-focus { + &:hover, &:focus { color: color-yiq($-btn-primary-color) !important; } } diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 76865cfcb17..b75b184dfd5 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -1343,7 +1343,7 @@ span.list-inline-item.o_add_language:last-child { color: rgba(color-yiq($-footer-color), 0.5); } - @include hover-focus { + &:hover, &:focus { @include o-apply-colors($-copyright-color, $with-extras: false, $background: $-footer-color); text-decoration: none; } diff --git a/addons/website/static/src/snippets/s_mega_menu_cards/000.scss b/addons/website/static/src/snippets/s_mega_menu_cards/000.scss index 457987b7abe..ab20f0336a8 100644 --- a/addons/website/static/src/snippets/s_mega_menu_cards/000.scss +++ b/addons/website/static/src/snippets/s_mega_menu_cards/000.scss @@ -1,7 +1,7 @@ .s_mega_menu_cards:not([data-vcss]) { .nav-link { - @include hover-focus { + &:hover, &:focus { background: rgba(0, 0, 0, .05); } } diff --git a/addons/website/static/src/snippets/s_mega_menu_images_subtitles/000.scss b/addons/website/static/src/snippets/s_mega_menu_images_subtitles/000.scss index 1edb8cf139a..dab08d77d89 100644 --- a/addons/website/static/src/snippets/s_mega_menu_images_subtitles/000.scss +++ b/addons/website/static/src/snippets/s_mega_menu_images_subtitles/000.scss @@ -5,7 +5,7 @@ } .nav-link { - @include hover-focus { + &:hover, &:focus { background: rgba(0, 0, 0, .05); } } diff --git a/addons/website/static/src/snippets/s_mega_menu_little_icons/000.scss b/addons/website/static/src/snippets/s_mega_menu_little_icons/000.scss index c676723cb2c..47fbef8244f 100644 --- a/addons/website/static/src/snippets/s_mega_menu_little_icons/000.scss +++ b/addons/website/static/src/snippets/s_mega_menu_little_icons/000.scss @@ -1,7 +1,7 @@ .s_mega_menu_little_icons:not([data-vcss]) { .nav-link { - @include hover-focus { + &:hover, &:focus { background: rgba(0, 0, 0, .05); } } diff --git a/addons/website_event/static/src/scss/event_templates_common.scss b/addons/website_event/static/src/scss/event_templates_common.scss index 19aa8a17a03..5c4dd47f9a1 100644 --- a/addons/website_event/static/src/scss/event_templates_common.scss +++ b/addons/website_event/static/src/scss/event_templates_common.scss @@ -56,7 +56,7 @@ border: $border-width solid gray('400'); @include o-bg-color(gray('white'), $with-extras: false); @include border-radius($dropdown-border-radius); - @include hover-focus { + &:hover, &:focus { border-color: theme-color('primary'); color: theme-color('primary'); text-decoration: none; diff --git a/addons/website_event/static/src/scss/event_templates_list.scss b/addons/website_event/static/src/scss/event_templates_list.scss index c352e2a6935..eaf6f8d9172 100644 --- a/addons/website_event/static/src/scss/event_templates_list.scss +++ b/addons/website_event/static/src/scss/event_templates_list.scss @@ -10,7 +10,7 @@ border: $border-width solid $border-color; border-radius: 50%; text-align: center; - @include hover-focus { + &:hover, &:focus { background-color: gray('300'); } } @@ -22,7 +22,7 @@ header { a { transition: all .25s ease-in-out; - @include hover-focus { + &:hover, &:focus { transform: scale(1.05); } } diff --git a/addons/website_mail/static/src/css/website_mail.scss b/addons/website_mail/static/src/css/website_mail.scss index def6d8d37cb..c83a048eea9 100644 --- a/addons/website_mail/static/src/css/website_mail.scss +++ b/addons/website_mail/static/src/css/website_mail.scss @@ -13,7 +13,7 @@ transition: opacity 0.3s ease; } - @include hover-focus () { + &:hover, &:focus { small { transition-duration: 1s; opacity: 1;