From c1393a713ce0b35cff441916737d9223cd1591ea Mon Sep 17 00:00:00 2001 From: Thanh Dodeur Date: Tue, 15 Sep 2020 10:12:10 +0000 Subject: [PATCH] [FIX] website: matches icon apps to the app switcher MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit makes it so that the icons of the website new-content menu are closer to the icon of the app they are related to. task-2329291 closes odoo/odoo#59236 X-original-commit: 4565a65e99a6dae323fd3d7ddf2010fea102bb91 Signed-off-by: Jérémy Kersten (jke) --- .../static/src/img/apps_thumbs/website_slide.svg | 1 + addons/website/static/src/js/menu/new_content.js | 7 ++++--- addons/website/static/src/scss/website.ui.scss | 10 ++++++++++ addons/website/views/website_navbar_templates.xml | 7 ++++--- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 addons/website/static/src/img/apps_thumbs/website_slide.svg diff --git a/addons/website/static/src/img/apps_thumbs/website_slide.svg b/addons/website/static/src/img/apps_thumbs/website_slide.svg new file mode 100644 index 00000000000..98a4ea0d267 --- /dev/null +++ b/addons/website/static/src/img/apps_thumbs/website_slide.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js index 1d6fdfce77e..e52801bd123 100644 --- a/addons/website/static/src/js/menu/new_content.js +++ b/addons/website/static/src/js/menu/new_content.js @@ -48,7 +48,7 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ $el.data('original-index', index); if ($el.data('module-id')) { $el.appendTo($el.parent()); - $el.find('a i, a p').addClass('text-muted'); + $el.find('a i, a p').addClass('o_uninstalled_module'); } }); @@ -280,8 +280,9 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ } // change style to use spinner $i.removeClass() - .addClass('fa fa-spin fa-spinner fa-pulse'); - $p.removeClass('text-muted') + .addClass('fa fa-spin fa-spinner fa-pulse') + .css('background-image', 'none'); + $p.removeClass('o_uninstalled_module') .text(_.str.sprintf(self.newContentText.installPleaseWait, name)); $el.fadeTo(1000, 1); }); diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss index 5bac9669000..7b589c5d22f 100644 --- a/addons/website/static/src/scss/website.ui.scss +++ b/addons/website/static/src/scss/website.ui.scss @@ -357,6 +357,16 @@ body .modal { opacity: 0; animation: fadeInDownSmall 1s forwards; + .o_uninstalled_module { + filter: brightness(70%) contrast(60%); + + } + + .module_icon { + display: block; + margin: auto; + } + a { display: block; font-size: 34px; diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml index 1126a8aaf5a..38b408b4989 100644 --- a/addons/website/views/website_navbar_templates.xml +++ b/addons/website/views/website_navbar_templates.xml @@ -126,7 +126,7 @@ t-att-data-module-shortdesc="mod.shortdesc" class="col-md-4 mb8 o_new_content_element"> - +

Event

@@ -166,7 +166,8 @@ t-att-data-module-shortdesc="mod.shortdesc" class="col-md-4 mb8 o_new_content_element"> - +

Course

@@ -176,7 +177,7 @@ t-att-data-module-shortdesc="mod.shortdesc" class="col-md-4 mb8 o_new_content_element o_new_content_element_once"> - +

Livechat Widget