From c0968e68eda55df624fb94016d036a2af598b10c Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Sun, 12 Aug 2018 23:17:24 +0200 Subject: [ADD] website_theme_install: try to make theme multi website compliant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From now, when you install a theme, it load the data from xml to template table theme [ir.ui.view|ir.attachment|website.page|website.menu]. Data are only copied from this template table into the real table when you choose a theme on a website; Making them website_specific and with a link to the original to allow futur update. A special case is done to create theme.ir.ui.view when you are installing a theme, even if you continue to use template tag to create quick view. Co-authored-by: Derie Romain Co-authored-by: Kersten Jérémy --- .../static/src/scss/website_theme_install.scss | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'addons/website_theme_install/static/src/scss') 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 cd83f76a4e7..ac4cf8ba575 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,9 +25,9 @@ background: none; border: none; - .o_browser_bar:before { + .o_browser_bar:after { content: "•••"; - display: block; + display: inline-block; padding-left: 10px; color: darken($o-theme-kanban-gray, 10%); font: 12px/20px Courier, monospace; @@ -35,13 +35,10 @@ } &.o_theme_installed .o_theme_preview_top { - border-color: $o-brand-primary; + border: 3px solid $o-brand-primary; - > .fa-check-circle { - @include o-position-absolute(10px, 10px); - width: 20px; - height: 20px; - font-size: 20px; + .fa { + color: $o-brand-primary; } } @@ -95,18 +92,16 @@ } } - &:not(.o_theme_installed) { - .o_theme_preview_top:hover { - transition: all .3s ease 0s; - transform: translateY(-10px); - border-color: darken($o-theme-kanban-gray, 26%); - box-shadow: 0 15px 12px -8px rgba(0, 0, 0, .4); - - .o_button_area { - opacity: 1; - visibility: visible; - transition: opacity 0.2s ease 0.1s; - } + .o_theme_preview_top:hover { + transition: all .3s ease 0s; + transform: translateY(-10px); + border-color: darken($o-theme-kanban-gray, 26%); + box-shadow: 0 15px 12px -8px rgba(0, 0, 0, .4); + + .o_button_area { + opacity: 1; + visibility: visible; + transition: opacity 0.2s ease 0.1s; } } } -- cgit v1.2.3