From 9d5fa81ba32dce1f2258c5c8b126a988d6e45fc5 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 14 Feb 2019 13:56:22 +0000
Subject: [PATCH] [REF] website_theme_install: update theme install screen
design
task-1907934
closes odoo/odoo#31114
---
.../src/scss/website_theme_install.scss | 24 +++++--------------
addons/website_theme_install/views/views.xml | 7 +++---
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/addons/website_theme_install/static/src/scss/website_theme_install.scss b/addons/website_theme_install/static/src/scss/website_theme_install.scss
index ac4cf8ba5754..65d95493b9ef 100644
--- a/addons/website_theme_install/static/src/scss/website_theme_install.scss
+++ b/addons/website_theme_install/static/src/scss/website_theme_install.scss
@@ -25,24 +25,8 @@
background: none;
border: none;
- .o_browser_bar:after {
- content: "•••";
- display: inline-block;
- padding-left: 10px;
- color: darken($o-theme-kanban-gray, 10%);
- font: 12px/20px Courier, monospace;
- letter-spacing: -1px;
- }
-
- &.o_theme_installed .o_theme_preview_top {
- border: 3px solid $o-brand-primary;
-
- .fa {
- color: $o-brand-primary;
- }
- }
-
.o_theme_preview_top {
+ position: relative;
border: 1px solid darken($o-theme-kanban-gray, 20%);
border-radius: 2px;
transform-origin: center bottom;
@@ -72,7 +56,7 @@
}
.o_button_area {
- @include o-position-absolute(20px, -1px, -1px, -1px);
+ @include o-position-absolute(0, 0, 0, 0);
transition: opacity 100ms ease 0s;
display: flex;
flex-flow: column nowrap;
@@ -104,6 +88,10 @@
transition: opacity 0.2s ease 0.1s;
}
}
+
+ &.o_theme_installed .o_theme_preview_top {
+ border: 3px solid $o-brand-primary;
+ }
}
/// Grouped Layout
diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml
index a93ac2ce5778..6564201861ac 100644
--- a/addons/website_theme_install/views/views.xml
+++ b/addons/website_theme_install/views/views.xml
@@ -21,9 +21,6 @@
<t t-set="image_url" t-value="has_image ? 'web/image/' + record.image_ids.raw_value[0] : record.icon.value"/>
<div class="o_theme_preview_top bg-white mb4">
- <div class="o_browser_bar">
- <i states="installed" t-if="record.is_installed_on_current_website.raw_value" class="text-center ml4 img-circle fa fa-check-circle" role="img" aria-label="Installed" title="Installed"/>
- </div>
<div t-attf-class="bg-gray-lighter #{has_screenshot? 'o_theme_screenshot' : (has_image ? 'o_theme_cover' : 'o_theme_logo')}" t-attf-style="background-image: url(#{image_url});"/>
<div t-if="record.is_installed_on_current_website.raw_value" class="o_button_area">
<button type="object" name="button_refresh_theme" class="btn btn-primary">Update theme</button>
@@ -35,6 +32,10 @@
<hr t-if="record.url.value"/>
<a role="button" t-if="record.url.value" class="btn btn-secondary" t-att-href="record.url.value" target="_blank">Live Preview</a>
</div>
+ <i states="installed" t-if="record.is_installed_on_current_website.raw_value"
+ class="fa fa-check position-absolute p-1 m-2 rounded-circle bg-primary shadow"
+ style="top: 0; right: 0;"
+ role="img" aria-label="Installed" title="Installed"/>
</div>
<div class="o_theme_preview_bottom clearfix">
<h5 t-if="record.display_name.value" class="text-uppercase float-left">
--
GitLab