[MERGE] forward port branch saas-11.3 up to 37eed7c509f

2 files changed, 6 insertions, 6 deletions

diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 255ba20b87e..96cc4946b64 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -25,13 +25,14 @@ odoo.define('website_forum.website_forum', function (require) {
             if ($('a[href*="/login"]').length) {
                 msg = _t('Sorry you must be logged in to perform this action');
             }
-            var $warning = $('<div class="alert alert-danger alert-dismissable oe_forum_alert" id="karma_alert">'+
+            var $warning = $('<div class="alert alert-danger alert-dismissable oe_forum_alert mt8" id="karma_alert">'+
                 '<button type="button" class="close notification_close" data-dismiss="alert" aria-hidden="true">&times;</button>'+
                 msg + '</div>');
-            var vote_alert = $(ev.currentTarget).parent().find("#vote_alert");
-            if (vote_alert.length === 0) {
-                $(ev.currentTarget).parent().append($warning);
+            var $voteAlert = $('#karma_alert');
+            if ($voteAlert.length) {
+                $voteAlert.remove();
             }
+            $(ev.currentTarget).after($warning);
         }
     });
 
diff --git a/addons/website_forum/static/src/scss/website_forum.scss b/addons/website_forum/static/src/scss/website_forum.scss
index fde4b88d78c..b4fb02792c2 100644
--- a/addons/website_forum/static/src/scss/website_forum.scss
+++ b/addons/website_forum/static/src/scss/website_forum.scss
@@ -130,6 +130,7 @@ a.no-decoration {
 
 .close.comment_delete {
     font-size: 16px;
+    float: none;
 }
 
 .country_flag {
@@ -154,8 +155,6 @@ a.no-decoration {
 
 .oe_forum_alert {
     position: absolute;
-    margin-top: -30px;
-    margin-left: 90px;
     width: 300px;
     z-index: 9999;
 }