From f18657fa5127f0ffe1fbb5f678e1354067babb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 12:22:30 +0100 Subject: [PATCH 01/11] eurelien-cd28-2022: fix footer links (#71798) --- static/eurelien-cd28-2022/_footer.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/eurelien-cd28-2022/_footer.scss b/static/eurelien-cd28-2022/_footer.scss index 1dc39819..8c60acfb 100644 --- a/static/eurelien-cd28-2022/_footer.scss +++ b/static/eurelien-cd28-2022/_footer.scss @@ -11,7 +11,11 @@ div#footer { } a { - @include link(white, black); + color: white; + &:hover { + color: $yellow-4; + background: none; + } } a.pk-button, a.pk-big-button { -- 2.39.2 From f4b32111cdc677f73207eec87f36cf9bc2fd8a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 12:30:30 +0100 Subject: [PATCH 02/11] eurelien-cd28-2022: add emails logo asset slot( #71798) --- static/eurelien-cd28-2022/config.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/eurelien-cd28-2022/config.json b/static/eurelien-cd28-2022/config.json index c6791c7a..adfeda4e 100644 --- a/static/eurelien-cd28-2022/config.json +++ b/static/eurelien-cd28-2022/config.json @@ -1,12 +1,14 @@ { "label": "Eurelien (CD28) - 2022", "variables": { - "theme_color": "#ffcd00" + "theme_color": "#ffcd00", + "email_header_asset": "emails:logo" }, "settings": { "combo": { "COMBO_ASSET_SLOTS.update": { - "header:logo": { "label": "Têtière : logo" } + "header:logo": { "label": "Têtière : logo" }, + "emails:logo": {"label": "Emails : logo"} } } } -- 2.39.2 From a03cf9dbf022aaa2b6447e63857da8bcbe81d727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 12:36:56 +0100 Subject: [PATCH 03/11] eurelien-cd28-2022: normalize custom classes names (#71798) --- static/eurelien-cd28-2022/_content.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/eurelien-cd28-2022/_content.scss b/static/eurelien-cd28-2022/_content.scss index a80bcc74..e2845d14 100644 --- a/static/eurelien-cd28-2022/_content.scss +++ b/static/eurelien-cd28-2022/_content.scss @@ -159,7 +159,7 @@ div.textcell, .cd28-page-header { } } -div.cell.cd-28-shadow { +div.cell.cd28-shadow { box-shadow: $shadow-1; } -- 2.39.2 From 0dd51860f318866d3994c50cc366e59074597024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 12:39:58 +0100 Subject: [PATCH 04/11] eurelien-cd28-2022: do not inherit parent page's page header (#71798) --- templates/variants/eurelien-cd28-2022/combo/page_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/variants/eurelien-cd28-2022/combo/page_template.html b/templates/variants/eurelien-cd28-2022/combo/page_template.html index 2eda363d..a9e6eb03 100644 --- a/templates/variants/eurelien-cd28-2022/combo/page_template.html +++ b/templates/variants/eurelien-cd28-2022/combo/page_template.html @@ -3,7 +3,7 @@ {% block before-main-content %}
- {% placeholder "page-header" name="En-tête de la page" optional=True acquired=True%} + {% placeholder "page-header" name="En-tête de la page" optional=True %} {% skeleton_extra_placeholder page-header-default %} {% end_skeleton_extra_placeholder %}
-- 2.39.2 From bff5f60f66351f53cc6854d7975fd5874c3f2781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 12:44:50 +0100 Subject: [PATCH 05/11] eurelien-cd28-2022: fix titles color in page header (#71798) --- static/eurelien-cd28-2022/_content.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/static/eurelien-cd28-2022/_content.scss b/static/eurelien-cd28-2022/_content.scss index e2845d14..e6b3f254 100644 --- a/static/eurelien-cd28-2022/_content.scss +++ b/static/eurelien-cd28-2022/_content.scss @@ -20,16 +20,28 @@ div#main-content { h1 { @extend %big-title-1; + color: $black; + &::before { background-image: url("img/title-img-white.svg"); } + + .cd28-title-header { + color: $gray-9; + } } h2:not(:first-child) { @extend %big-title-2; + color: $black; + &::before { background-image: url("img/title-img-white.svg"); } + + .cd28-title-header { + color: $gray-9; + } } } -- 2.39.2 From 98080595d0eafe69ce3e8b55ecc9d30e9a5b04b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 13:06:50 +0100 Subject: [PATCH 06/11] eurelien-cd28-2022: fix big titles icon vertical alignment (#71798) --- static/eurelien-cd28-2022/_typo.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/eurelien-cd28-2022/_typo.scss b/static/eurelien-cd28-2022/_typo.scss index d897e1a5..00b4abe0 100644 --- a/static/eurelien-cd28-2022/_typo.scss +++ b/static/eurelien-cd28-2022/_typo.scss @@ -50,7 +50,8 @@ padding-left: 2.6em; padding-bottom: 0; &::before { - bottom: 0.5em; + bottom: auto; + top: 0.8em; } } } -- 2.39.2 From ab319433f38bc7bc9bdbbedc61b2a001b23928ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 13:11:31 +0100 Subject: [PATCH 07/11] eurelien-cd28-2022: Show form title under page header (#71798) --- static/eurelien-cd28-2022/_wcs.scss | 4 ++++ .../variants/eurelien-cd28-2022/wcs/base.html | 16 ++++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/static/eurelien-cd28-2022/_wcs.scss b/static/eurelien-cd28-2022/_wcs.scss index 92331f71..35f5ffad 100644 --- a/static/eurelien-cd28-2022/_wcs.scss +++ b/static/eurelien-cd28-2022/_wcs.scss @@ -8,6 +8,10 @@ border-radius: $border-radius; margin-bottom: $space-large; } + + &--title { + @extend h3; + } } div#tracking-code { diff --git a/templates/variants/eurelien-cd28-2022/wcs/base.html b/templates/variants/eurelien-cd28-2022/wcs/base.html index 4bea3a2a..73be6041 100644 --- a/templates/variants/eurelien-cd28-2022/wcs/base.html +++ b/templates/variants/eurelien-cd28-2022/wcs/base.html @@ -4,20 +4,12 @@
{% if title %} {% with title|split:" " as title_elements %} - {% if title_elements|length > 1 %} -

- {{ title_elements|first }} - {{ title_elements|slice:"1:"|join:" " }} -

- {% else %} -

{{ title }}

- {% endif %} +

+ Les + démarches +

{% endwith %} - {% if view.formdef.description %} - {{ view.formdef.description | safe }} - {% endif %} {% endif %}
{% endblock %} -{% block wcs-form-title %}{% endblock %} -- 2.39.2 From dc0a8acb075e5c021bf3481412345112be2b2154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 13:13:12 +0100 Subject: [PATCH 08/11] eurelien-cd28-2022: remove arrows in desktop navigation (#71798) --- static/eurelien-cd28-2022/_nav.scss | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/static/eurelien-cd28-2022/_nav.scss b/static/eurelien-cd28-2022/_nav.scss index 0b14c03e..5b88687a 100644 --- a/static/eurelien-cd28-2022/_nav.scss +++ b/static/eurelien-cd28-2022/_nav.scss @@ -95,10 +95,6 @@ div.gru-nav .gru-nav-button { &:hover .menu--link { border-bottom-color: $yellow-4; - &:after { - content: "\ea78"; // arrow-up-s-line - } - &:not(:hover) { color: white; } @@ -118,18 +114,13 @@ div.gru-nav .gru-nav-button { &--link { margin: 0; - // right padding is set to small to let space for the dropdown icon - @media($min-desktop-viewport) { - padding-right: $space-small; - } &::after { content: "\ea6e"; // arrow-right-s-line font-family: "RemixIcon"; @media($min-desktop-viewport) { - content: "\ea4e"; // arrow-down-s-line - margin-left: $space-small; + content: none; } } } -- 2.39.2 From 8ca68ae6bf8258d7e487e824420ea2982072db83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 5 Dec 2022 14:36:52 +0100 Subject: [PATCH 09/11] eurelien-cd28-2022: fix nav item border-bottom on desktop resolutions (#71798) --- static/eurelien-cd28-2022/_nav.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/eurelien-cd28-2022/_nav.scss b/static/eurelien-cd28-2022/_nav.scss index 5b88687a..f16c72d5 100644 --- a/static/eurelien-cd28-2022/_nav.scss +++ b/static/eurelien-cd28-2022/_nav.scss @@ -88,7 +88,7 @@ div.gru-nav .gru-nav-button { // Menu items create the bottom padding for the header here, so // they reach the bottom of the header and stay hovered when // moving the mouse to the submenu. - height: calc(#{$header-logo-height} + #{$header-desktop-padding-v}); + min-height: calc(#{$header-logo-height} + #{$header-desktop-padding-v}); padding-bottom: $header-desktop-padding-v; // border-bottom when mouse in in submenu -- 2.39.2 From db5edc651db1be76a90daf0cba609afdeea14c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 12 Dec 2022 16:43:40 +0100 Subject: [PATCH 10/11] eurelien-cd28-2022: make page header full width (#71798) --- static/eurelien-cd28-2022/_content.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/static/eurelien-cd28-2022/_content.scss b/static/eurelien-cd28-2022/_content.scss index e6b3f254..b7e56c0c 100644 --- a/static/eurelien-cd28-2022/_content.scss +++ b/static/eurelien-cd28-2022/_content.scss @@ -3,9 +3,6 @@ div#main-content { } .cd28-page-header { - clear: both; - margin: 0 auto; - max-width: $header-width; width: 100%; background: url("img/page-banner.jpeg"); background-size: 100% 100%; -- 2.39.2 From c954d797a560c79c3d6d2670bb60e7ae67c258ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 12 Dec 2022 16:46:05 +0100 Subject: [PATCH 11/11] eurelien-cd28-2022: reset title vertical margins (#71798) --- static/eurelien-cd28-2022/_typo.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/eurelien-cd28-2022/_typo.scss b/static/eurelien-cd28-2022/_typo.scss index 00b4abe0..2175e882 100644 --- a/static/eurelien-cd28-2022/_typo.scss +++ b/static/eurelien-cd28-2022/_typo.scss @@ -4,6 +4,8 @@ line-height: $lineheight-1; font-size: $mobile-size; font-weight: $weight; + margin-top: 0em; + margin-bottom: 1em; @media($min-desktop-viewport) { font-size: $desktop-size; -- 2.39.2