From f2d1cf95594609f4030daf2daa212f80673ba2dc Mon Sep 17 00:00:00 2001 From: Xavier Dubuc Date: Wed, 8 Jul 2020 10:01:45 +0000 Subject: [PATCH] [FIX] mail: fix chatter topbar style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Follow button is now correctly aligned in document app chatter overlay - Topbar does not move up anymore on select Send Message or Log note task-2287136 closes odoo/odoo#54247 X-original-commit: 6f05705158a7a197945e6720f5ac231ce6932686 Signed-off-by: Alexandre Kühn (aku) Signed-off-by: Sébastien Theys (seb) --- .../components/chatter_topbar/chatter_topbar.scss | 13 +++++++------ .../src/components/follow_button/follow_button.scss | 8 ++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.scss b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.scss index 17c5fa5d856..72431aad60e 100644 --- a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.scss +++ b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.scss @@ -9,14 +9,11 @@ } .o_ChatterTopbar_actions { + border-bottom: $border-width solid; display: flex; flex: 1; flex-direction: row; flex-wrap: wrap; - - &.o-has-active-button { - border-bottom: $border-width solid; - } } .o_ChatterTopbar_button { @@ -54,8 +51,12 @@ // Style // ------------------------------------------------------------------ -.o_ChatterTopbar_actions.o-has-active-button { - border-color: $border-color; +.o_ChatterTopbar_actions { + border-color: transparent; + + &.o-has-active-button { + border-color: $border-color; + } } .o_ChatterTopbar_button { diff --git a/addons/mail/static/src/components/follow_button/follow_button.scss b/addons/mail/static/src/components/follow_button/follow_button.scss index 431de0e8577..36fb60e788a 100644 --- a/addons/mail/static/src/components/follow_button/follow_button.scss +++ b/addons/mail/static/src/components/follow_button/follow_button.scss @@ -1,3 +1,11 @@ +// ------------------------------------------------------------------ +// Layout +// ------------------------------------------------------------------ + +.o_FollowButton { + display: flex; +} + // ------------------------------------------------------------------ // Style // ------------------------------------------------------------------