summaryrefslogtreecommitdiff
path: root/addons/mail/static/src
diff options
context:
space:
mode:
authorXavier Dubuc <xdu@odoo.com>2020-07-08 10:01:45 +0000
committerXavier Dubuc <xdu@odoo.com>2020-07-08 16:42:25 +0000
commitf2d1cf95594609f4030daf2daa212f80673ba2dc (patch)
tree84bbba6c2b7aabe82f6440296717062698f60975 /addons/mail/static/src
parente4235a8d165acbc135a341ac0d09b7aabfabb690 (diff)
[FIX] mail: fix chatter topbar style
- 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) <aku@odoo.com> Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Diffstat (limited to 'addons/mail/static/src')
-rw-r--r--addons/mail/static/src/components/chatter_topbar/chatter_topbar.scss13
-rw-r--r--addons/mail/static/src/components/follow_button/follow_button.scss8
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,4 +1,12 @@
// ------------------------------------------------------------------
+// Layout
+// ------------------------------------------------------------------
+
+.o_FollowButton {
+ display: flex;
+}
+
+// ------------------------------------------------------------------
// Style
// ------------------------------------------------------------------