From f6cb15eddd48abf06267641654bc8e99a5c19ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Warnon?= Date: Mon, 15 Mar 2021 10:56:25 +0000 Subject: [PATCH] [FIX] survey: remove global rules applying on all reports This commit removes 2 css rules that were applied on ALL odoo reports by mistake. Indeed, adding rules on "*" and "body" will most likely break other reporting layouts and is very dangerous / unintended. If these rules are needed for the survey reports, then it should be fixed to make them only applied to those reports instead. We also took this opportunity to get rid of some scss variables. These variables names were too "global" and could also conflict with other reporting css rulesets. If we want to use variables for that report, they should be correctly pre-fixed to avoid collisions. Source: 212b107fa155778e2b2063b66bb88517aba80498 A proper fix will follow to make the survey reports work properly (see task-2483393). Task-2341847 closes odoo/odoo#67836 Signed-off-by: Thibault Delavallee (tde) --- .../static/src/scss/survey_reports.scss | 56 +++++++------------ 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/addons/survey/static/src/scss/survey_reports.scss b/addons/survey/static/src/scss/survey_reports.scss index bbae25ad1ef..c7c0e8c5161 100644 --- a/addons/survey/static/src/scss/survey_reports.scss +++ b/addons/survey/static/src/scss/survey_reports.scss @@ -27,37 +27,21 @@ font-weight: bold; } -$lightgrey: #f2f2f2; -$font-muted: #6b6d70; -$font-color: #282f33; -$white: #ffffff; -$purple: #875A7B; -$gold: #d7a520; -$blue: #263e86; - -* { - box-sizing: border-box; -} - -body { - zoom: 117.2%; -} - #o_survey_certification.certification-wrapper { width: 297mm; height: 210mm; - background-color: $purple; + background-color: #875A7B; position: relative; display: flex; margin-left: -15px; margin-right: -15px; &.blue { - background-color: $blue; + background-color: #263e86; } &.gold { - background-color: $gold; + background-color: #d7a520; } .test-entry { @@ -100,21 +84,21 @@ body { .certification-content { p { font-size: 16pt; - color: $font-muted; + color: #6b6d70; .user-name { font-family: certification-cursive, cursive; font-size: 50pt; line-height: 2; - color: $font-color; - border-bottom: 1pt solid $font-color; + color: #282f33; + border-bottom: 1pt solid #282f33; } .certification-name { font-size: 18pt; line-height: 1.5; text-transform: uppercase; - color: $font-color; + color: #282f33; } } } @@ -129,7 +113,7 @@ body { text-align: center; .certification-date { - border-bottom: 1pt solid $font-color; + border-bottom: 1pt solid #282f33; } } @@ -147,7 +131,7 @@ body { } } .certification-number { - color: $font-muted; + color: #6b6d70; position: absolute; font-size: 10pt; } @@ -157,7 +141,7 @@ body { &.classic { &.blue .certification { - color: $blue; + color: #263e86; .certification-top { &:before, &:after { @@ -166,12 +150,12 @@ body { } .certification-content p .certification-name { - color: $blue; + color: #263e86; } } &.gold .certification { - color: $gold; + color: #d7a520; .certification-top { &:before, &:after{ @@ -179,7 +163,7 @@ body { } } .certification-content p .certification-name { - color: $gold; + color: #d7a520; } } @@ -191,7 +175,7 @@ body { width: 295mm; height: 208mm; margin: 1mm; - color: $purple; + color: #875A7B; .certification-top { padding-top: 10mm; @@ -220,7 +204,7 @@ body { margin-bottom: 10mm; p .certification-name { - color: $purple; + color: #875A7B; } } @@ -231,7 +215,7 @@ body { .certification-date-wrapper { margin-left: 40mm; font-size: 18pt; - color: $font-muted; + color: #6b6d70; span { font-size: 18pt; @@ -283,7 +267,7 @@ body { width: 272mm; height: 185mm; margin: 12.5mm; - background-color: $lightgrey; + background-color: #f2f2f2; text-align: center; .certification-seal { @@ -298,7 +282,7 @@ body { .certification-top { padding-top: 28mm; padding-bottom: 10mm; - color: $font-color; + color: #282f33; h1 b { font-weight: bold; @@ -314,12 +298,12 @@ body { .certification-date { font-size: 18pt; - color: $font-color; + color: #282f33; } span { font-size: 14pt; - color: $font-muted; + color: #6b6d70; } }