diff --git a/addons/gamification/data/gamification_karma_rank_data.xml b/addons/gamification/data/gamification_karma_rank_data.xml index e0ef1320a4eed..5ae425d547320 100644 --- a/addons/gamification/data/gamification_karma_rank_data.xml +++ b/addons/gamification/data/gamification_karma_rank_data.xml @@ -13,8 +13,8 @@ Newbie

You just began the adventure! Welcome!

-
-
Earn your first points and join the adventure !
+
+
Earn your first points and join the adventure !
@@ -26,8 +26,8 @@ Student

You're a young padawan now. May the force be with you!

-
-
Reach the next rank to show the rest of the world you exist.
+
+
Reach the next rank to show the rest of the world you exist.
@@ -39,8 +39,8 @@ Bachelor

You love learning things. Curiosity is a good way to progress.

-
-
Reach the next rank to improve your status!
+
+
Reach the next rank to improve your status!
@@ -52,8 +52,8 @@ Master

You know what you are talking about. People learn from you.

-
-
Reach the next rank and become a Master!
+
+
Reach the next rank and become a Master!
@@ -65,8 +65,8 @@ Doctor

You have reached the last rank. Congratulations!

-
-
Reach the next rank and become a powerful user!
+
+
Reach the next rank and become a powerful user!
diff --git a/addons/gamification/data/gamification_karma_rank_demo.xml b/addons/gamification/data/gamification_karma_rank_demo.xml index 848e7fd68d097..bdf1ecbac4412 100644 --- a/addons/gamification/data/gamification_karma_rank_demo.xml +++ b/addons/gamification/data/gamification_karma_rank_demo.xml @@ -3,8 +3,8 @@ -
-
Reach the next rank and gain a very nice mug !
+
+
Reach the next rank and gain a very nice mug !
@@ -12,8 +12,8 @@ -
-
Reach the next rank and gain a very magic wand !
+
+
Reach the next rank and gain a very magic wand !
@@ -21,8 +21,8 @@ -
-
Reach the next rank and gain a very nice hat !
+
+
Reach the next rank and gain a very nice hat !
@@ -30,8 +30,8 @@ -
-
Reach the next rank and gain a very nice unicorn !
+
+
Reach the next rank and gain a very nice unicorn !
diff --git a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss index cc8f8af2812fe..0be973463425e 100644 --- a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss +++ b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss @@ -135,7 +135,7 @@ overflow: visible; margin-top: 0; - &, .o_media_left, .media-body { + &, .o_media_left, .flex-grow-1 { position: relative; } @@ -143,7 +143,7 @@ padding-right: 10px; } - .media-body { + .flex-grow-1 { vertical-align: middle; .badge { @@ -203,7 +203,7 @@ .o_media_left { padding-right: 0; } - .media-body > a { + .flex-grow-1 > a { padding-left: 10px; max-width: 100%; display: block; @@ -218,7 +218,7 @@ .o_media_object { box-shadow: 0 0 0 $o-hr-org-chart-entry-line-w*2 rgba($o-brand-primary, 0.6); } - .media-body > a { + .flex-grow-1 > a { .o_media_heading { color: $o-brand-primary; } @@ -246,7 +246,7 @@ box-shadow: inset 0 0 0 $o-hr-org-chart-entry-line-w*2 white; } - .media-body { + .flex-grow-1 { opacity: 1; } } diff --git a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml index d3835bea5cfa0..0e4918b4367d4 100644 --- a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml +++ b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml @@ -2,7 +2,7 @@ -
+
@@ -19,7 +19,7 @@ t-att-style="'background-image:url(\'/web/image/hr.employee.public/' + employee.id + '/avatar_1024/\')'"/>
-