From 4ddda3132274e43423f1d8b3753cebb64a920442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 17 Nov 2018 10:17:12 +0100 Subject: [PATCH] split app & hacks in specific files --- gadjo/static/css/_hacks.scss | 33 +++++++++++++++ gadjo/static/css/_portal.scss | 31 ++++++++++++++ gadjo/static/css/_wcs.scss | 17 ++++++++ gadjo/static/css/gadjo.scss | 77 ++--------------------------------- 4 files changed, 84 insertions(+), 74 deletions(-) create mode 100644 gadjo/static/css/_hacks.scss create mode 100644 gadjo/static/css/_portal.scss create mode 100644 gadjo/static/css/_wcs.scss diff --git a/gadjo/static/css/_hacks.scss b/gadjo/static/css/_hacks.scss new file mode 100644 index 0000000..64a93b4 --- /dev/null +++ b/gadjo/static/css/_hacks.scss @@ -0,0 +1,33 @@ +/* temporary hacks for applications */ + +div.form-inner-container, // authentic +div#pages-list, // combo +div.placeholder, // combo +table.agenda-table, // chrono +div#appbar + form, // misc +div#main-content > h2:first-child + form, // w.c.s. +div#appbar + div#description // passerelle +{ + background: white; + padding: 0.5rem; + border-radius: 3px; + box-sizing: border-box; +} + +div.other_actions { // authentic + margin-left: 71%; + width: 29%; +} + +div div.bo-block ul.biglist { // w.c.s. + margin: -1ex; +} + +div div.bo-block ul.biglist p.details.badge { // w.c.s. + background: $secondary-color; +} + +body.welco-home div#main-content { + background: white; + margin: 0; +} diff --git a/gadjo/static/css/_portal.scss b/gadjo/static/css/_portal.scss new file mode 100644 index 0000000..554986e --- /dev/null +++ b/gadjo/static/css/_portal.scss @@ -0,0 +1,31 @@ +div.cell.shown-because-admin { + opacity: 0.5; + background-image: repeating-linear-gradient(-45deg, #eee 0px, #eee 14px, transparent 15px, transparent 30px); + &:hover { + opacity: 1; + background-image: inherit; + } +} + +div#portal-agent-content { + div.searchcell { + font-size: 110%; + } + div.cell { + background: white; + padding: 1rem; + margin-bottom: 1rem; + border-radius: 3px; + &.transparent { + background: transparent; + } + &.highlight { + background: linear-gradient(to right, $primary-color 0%, $secondary-color 130vh); + background: linear-gradient(to right, var(--primary-color) 0%, var(--secondary-color) 130vh); + color: white; + h2 { + color: white; + } + } + } +} diff --git a/gadjo/static/css/_wcs.scss b/gadjo/static/css/_wcs.scss new file mode 100644 index 0000000..c328ca3 --- /dev/null +++ b/gadjo/static/css/_wcs.scss @@ -0,0 +1,17 @@ +div#side { // w.c.s. steps in backoffice submission + background: white; + padding: 0.5rem; + border-radius: 3px 3px 0 0; + & + form { + background: white; + padding: 0.5rem; + border-radius: 0 0 3px 3px; + } + #steps ol { + background: transparent; + .current span.marker { + background: $primary-color; + border-color: darken($primary-color, 20%); + } + } +} diff --git a/gadjo/static/css/gadjo.scss b/gadjo/static/css/gadjo.scss index 6bcf778..9072cdc 100644 --- a/gadjo/static/css/gadjo.scss +++ b/gadjo/static/css/gadjo.scss @@ -583,15 +583,6 @@ ul.apps li a:hover { border-radius: 25px; } -/* Combo specific class */ -div.cell.shown-because-admin { - opacity: 0.5; - background-image: repeating-linear-gradient(-45deg, #eee 0px, #eee 14px, transparent 15px, transparent 30px); - &:hover { - opacity: 1; - background-image: inherit; - } -} /* footer */ @@ -1220,68 +1211,6 @@ div.section { @import 'grid'; @import 'jqueryui'; @import 'forms'; - -/* temporary hacks for applications */ - -div.form-inner-container, // authentic -div#pages-list, // combo -div.placeholder, // combo -table.agenda-table, // chrono -div#appbar + form, // misc -div#main-content > h2:first-child + form, // w.c.s. -div#appbar + div#description // passerelle -{ - background: white; - padding: 0.5rem; - border-radius: 3px; - box-sizing: border-box; -} - -div.other_actions { // authentic - margin-left: 71%; - width: 29%; -} - -div div.bo-block ul.biglist { // w.c.s. - margin: -1ex; -} - -div div.bo-block ul.biglist p.details.badge { // w.c.s. - background: $secondary-color; -} - -body.welco-home div#main-content { - background: white; - margin: 0; -} - -div#side { // w.c.s. steps in backoffice submission - background: white; - padding: 0.5rem; - border-radius: 3px 3px 0 0; - & + form { - background: white; - padding: 0.5rem; - border-radius: 0 0 3px 3px; - } - #steps ol { - background: transparent; - .current span.marker { - background: $primary-color; - border-color: darken($primary-color, 20%); - } - } -} - -div#portal-agent-content { - div.cell { - &.highlight { - background: linear-gradient(to right, $primary-color 0%, $secondary-color 130vh); - background: linear-gradient(to right, var(--primary-color) 0%, var(--secondary-color) 130vh); - color: white; - h2 { - color: white; - } - } - } -} +@import 'portal'; +@import 'wcs'; +@import 'hacks';