From 4fc0079f5f57bbbc272a8963b0691c852599d9be Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Tue, 9 Jan 2018 10:36:48 +0100 Subject: [PATCH] [REF] web_editor, website: LESS simplification and correction The variables.less file was producing CSS which was then multiplicated by the number of bundles (see less_helpers). Also simplify some LESS. --- .../web_editor/static/src/img/transparent.png | Bin 0 -> 135 bytes .../static/src/less/web_editor.ui.less | 37 ++++++++-- .../static/src/less/web_editor.variables.less | 63 +----------------- .../website/static/src/less/website.ui.less | 31 +++------ .../static/src/xml/website.pageProperties.xml | 12 ++-- 5 files changed, 50 insertions(+), 93 deletions(-) create mode 100644 addons/web_editor/static/src/img/transparent.png diff --git a/addons/web_editor/static/src/img/transparent.png b/addons/web_editor/static/src/img/transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..4a1bec033e781a0e207447cc546a6aae169cd4e9 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih{( zJaZG%Q-e|yQz{EjrrH1%X?nUihE&{2+Ee*ijaeulIN14_k>LYYlc{Nc{{Oc(`hRV0 gbo0?n21Yi96CE70EjZun0W~pry85}Sb4q9e08i{GVgLXD literal 0 HcmV?d00001 diff --git a/addons/web_editor/static/src/less/web_editor.ui.less b/addons/web_editor/static/src/less/web_editor.ui.less index 9696d8b3a84..e2a25e8e9e0 100644 --- a/addons/web_editor/static/src/less/web_editor.ui.less +++ b/addons/web_editor/static/src/less/web_editor.ui.less @@ -237,11 +237,6 @@ html[lang] > body.editor_enable [data-oe-translation-state] { } // DROPZONES -@-webkit-keyframes dropZoneInsert { - to { - background-color: fade(@odoo-brand-primary, 20%); - } -} @keyframes dropZoneInsert { to { background-color: fade(@odoo-brand-primary, 20%); @@ -1073,7 +1068,7 @@ body.editor_enable { // Mixins for buttons with alpha bg-color .o_alpha_button_preview () { position: relative; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpivHnzJgMSUFNTQ+YyMeAFNJVm/P//PzL/1q1bg8VpAAEGAMiICJs4Ce8uAAAAAElFTkSuQmCC'); + background-image: url('/web_editor/static/src/img/transparent.png'); background-size: 10px auto; z-index: 1; @@ -1086,6 +1081,36 @@ body.editor_enable { } } +// Animations +@keyframes fadeInDownSmall { + 0% { + opacity: 0; + .translate(0, -5px); + } + 100% { + opacity: 1; + .translate(0, 0); + } +} +@keyframes fadeInOut { + 0% { + opacity: 0; + } + 25% { + opacity: 1; + } + 75% { + opacity: 1; + } + 100% { + opacity: 0; + } +} +@keyframes inputHighlighter { + from { background: @odoo-brand-optional; } + to { width: 0; background: transparent; } +} + // INPUTS @o-switch-size: 2ex; @o-switch-inactive-color: @gray-lighter; diff --git a/addons/web_editor/static/src/less/web_editor.variables.less b/addons/web_editor/static/src/less/web_editor.variables.less index c735967af86..382969d96b3 100644 --- a/addons/web_editor/static/src/less/web_editor.variables.less +++ b/addons/web_editor/static/src/less/web_editor.variables.less @@ -24,71 +24,10 @@ // Transitions @o-we-md-ease: cubic-bezier(0.19, 1, 0.22, 1); -// Animations -@-webkit-keyframes fadeInDownSmall { - 0% { - opacity: 0; - .translate(0, -5px); - } - 100% { - opacity: 1; - .translate(0, 0); - } -} -@keyframes fadeInDownSmall { - 0% { - opacity: 0; - .translate(0, -5px); - } - 100% { - opacity: 1; - .translate(0, 0); - } -} - -@-webkit-keyframes fadeInOut { - 0% { - opacity: 0; - } - 25% { - opacity: 1; - } - 75% { - opacity: 1; - } - 100% { - opacity: 0; - } -} -@keyframes fadeInOut { - 0% { - opacity: 0; - } - 25% { - opacity: 1; - } - 75% { - opacity: 1; - } - 100% { - opacity: 0; - } -} - -@-webkit-keyframes inputHighlighter { - from { background: @odoo-brand-optional; } - to { width: 0; background: transparent; } -} -@keyframes inputHighlighter { - from { background: @odoo-brand-optional; } - to { width: 0; background: transparent; } -} - - // ============ 'Preview' component Mixins =============== // Create a "preview" work-area to edit/customize specific elements -.o-we-preview-box(@padding: 0px 25px 25px 25px, @color-text: white ) { +.o-we-preview-box(@padding: 0px 25px 25px 25px, @color-text: white) { padding: @padding; border-top: 1px solid black; border-bottom: 1px solid white; diff --git a/addons/website/static/src/less/website.ui.less b/addons/website/static/src/less/website.ui.less index 7b815feac27..1527e9a7b87 100644 --- a/addons/website/static/src/less/website.ui.less +++ b/addons/website/static/src/less/website.ui.less @@ -517,32 +517,21 @@ body .modal { } // Pages Management -.o_page_management_info{ - .o_switch{ +.o_page_management_info { + .o_switch { padding-top: 7px; } } -.popover_dep{ - overflow-x: auto; -} -#edit_website_pages{ - .fa-check{ - color: #00a09d; - } - .fa-eye-slash{ - color: #00a09d; - } - th{ +#edit_website_pages { + th { background-color: @odoo-brand-primary; color: white; } - td{ - a.fa{ - color: @odoo-brand-primary; - margin-left: 5px; - } - .text-muted{ - opacity: 0.5; - } + td > a.fa { + margin-left: 5px; + color: @odoo-brand-primary; + } + .fa-check, .fa-eye-slash { + color: @odoo-brand-optional; } } diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml index 33ff810ec12..098bb5533b5 100644 --- a/addons/website/static/src/xml/website.pageProperties.xml +++ b/addons/website/static/src/xml/website.pageProperties.xml @@ -6,10 +6,14 @@ -