From ee2a497b9a24e9999c487bd2798e85cddb1bce4c Mon Sep 17 00:00:00 2001 From: Brieuc-brd Date: Wed, 11 May 2022 11:28:50 +0000 Subject: [PATCH] [REF] mail: `ThreadViewTopbar`, review and simplify scss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of the overall v16 SCSS optimization/restyle, task-2704984 task-2850473 closes odoo/odoo#91116 Signed-off-by: Alexandre Kühn (aku) --- .../thread_view_topbar.scss | 86 +------------------ .../thread_view_topbar/thread_view_topbar.xml | 36 ++++---- 2 files changed, 20 insertions(+), 102 deletions(-) diff --git a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.scss b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.scss index 6e60808e7cd..90072828dc3 100644 --- a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.scss +++ b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.scss @@ -7,18 +7,8 @@ } .o_ThreadViewTopbar_avatar { - height: 26px; - width: 26px; - object-fit: cover; -} - -.o_ThreadViewTopbar_editableItem { - border: $border-width solid; -} - -.o_ThreadViewTopbar_threadDescriptionSeparator { - width: $border-width; - height: $font-size-sm; + height: $o-mail-partner-avatar-size; + width: $o-mail-partner-avatar-size; } .o_ThreadViewTopbar_title { @@ -29,83 +19,11 @@ // Style // ------------------------------------------------------------------ -.o_ThreadViewTopbar { - background-color: gray('100'); -} - -.o_ThreadViewTopbar_button { - background: none; - border: none; - outline: none; - - &.o-active { - color: gray('700'); - } - - &:not(.o-active) { - color: gray('500'); - } - - @include hover-focus () { - outline: none; - color: gray('600'); - } -} - // use selector specificity to override bootstrap style input.o_ThreadViewTopbar_guestNameInput { width: 150px; } -.o_ThreadViewTopbar_invitePopoverView .popover-body { - padding: 0; // cancel unwanted padding -} - -.o_ThreadViewTopbar_threadDescriptionSeparator { - background-color: $border-color; -} - .o_ThreadViewTopbar_threadName { max-width: map-get($sizes, 75); - - &:not(.o-threadNameEditable) { - border-color: transparent; // presence of border even if invisible to prevent flicker - } - - &.o-threadNameEditable { - background-color: $white; - border-color: $border-color; - } -} - -.o_ThreadViewTopbar_threadDescription { - - &:not(.o-threadDescriptionEditable) { - border-color: transparent; // presence of border even if invisible to prevent flicker - } - - &.o-threadDescriptionEditable { - background-color: $white; - border-color: $border-color; - } -} - -.o_ThreadViewTopbar_threadAddDescriptionEmptyLabel { - color: gray('400'); - cursor: pointer; - - &:hover { - color: gray('900'); - } -} - -.o_ThreadViewTopbar_userName { - &:not(.o-userNameEditable) { - border-color: transparent; - } - - &.o-userNameEditable { - background-color: $white; - border-color: $border-color; - } } diff --git a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml index 4457a113c53..acd89935180 100644 --- a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml +++ b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml @@ -3,14 +3,14 @@ -
+
-
+
@@ -19,20 +19,20 @@ -
+
Discuss
-
+
-
+
-
+
Add a description
@@ -50,16 +50,16 @@ - - - @@ -67,22 +67,22 @@ - -
- Avatar + Avatar - +