diff --git a/static/rouen/_custom.scss b/static/rouen/_custom.scss index aeaab2a..8f0b85d 100644 --- a/static/rouen/_custom.scss +++ b/static/rouen/_custom.scss @@ -2,9 +2,9 @@ @font-face { font-family: 'MarsIcons'; - src: url('fonts/marsicons12.ttf') format('truetype'), - url('fonts/marsicons12.woff') format('woff'), - url('fonts/marsicons12.woff2') format('woff2'); + src: url('fonts/marsicons13.ttf') format('truetype'), + url('fonts/marsicons13.woff') format('woff'), + url('fonts/marsicons13.woff2') format('woff2'); font-weight: normal; font-style: normal; } @@ -27,12 +27,23 @@ h1, h2, h3, h4, div.textcell h3, div.textcell h4 { h1 { color: $red; - font-size: 237%; + font-size: 175%; + padding-left: 0.9rem; } h2 { color: $red; - font-size: 187%; + font-size: 150%; +} + +li.required-authentication a::after { + content: "\e04d"; + font-family: MarsIcons; + position: absolute; + right: 1rem; + color: #444; + font-size: 170%; + top: 0.35em; } #login-page h2 { @@ -79,6 +90,7 @@ div#header { background-position: inherit; } } + margin-bottom: 2em; } h1#logo a { @@ -394,4 +406,239 @@ input[type="submit"]:hover, div.buttons input:hover { } div.a2-block p { margin-left: 0; } -div.a2-block form, div.a2-block > p { margin: 1em 1em; } \ No newline at end of file +div.a2-block form, div.a2-block > p { margin: 1em 1em; } + +/* Home page */ +body.page-index { + .gru-content { display: block; } + + .bonjour { + text-align: center; + font-size: 175%; + font-weight: bold; + color: #198468; + margin-bottom: 1em; + } +} + +.cell-summary { display: none; } +body.page-index #sidebar { + flex: inherit; + max-width: inherit; + + @media screen and (min-width: $mobile-limit) { + display: grid; + column-gap: 1rem; + row-gap: 1rem; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-template-areas: + "a a a a" + "b b c d" + "e e f f" + "g g g g"; + + .introduction { grid-area: a; } + .suivi { grid-area: b; } + .creer-compte { grid-column: d-end / 3;} + .en-cours { grid-area: c; } + .brouillons { grid-area: d; } + .coffre-fort { grid-area: e; } + .historique { grid-area: f; } + .toutes-demarches { grid-area: g; } + } + + .toutes-demarches h1 { margin-top: 1em; } + + .btlnk { + background-color: #82cebb; + &::after { color: #82cebb; } + } + + .creer-compte { + background-image: url(img/picto_create.svg); + background-size: 5em 5em; + background-repeat: no-repeat; + background-position: 1rem 1rem; + + h2 { + margin-left: 4em; + line-height: 3.5em; + } + } + + h1, h2, h3, p, form, .cell { + margin: 0; + padding: 0; + border-radius: 0; + } + + p { margin: 1em 0; } + + button { background-color: #82cebb; } + + h1 { + text-align: center; + font-size: 175%; + } + + .introduction h1 { color: #198468; } + + h2 { font-size: 150%; } + + .suivi h2 { + position: relative; + left: 1.55em; + background-color: #82cebb; + padding: 0.5em 0.5em; + display: inline-block; + width: 9em; + text-align: center; + + &::before { + content: ' '; + background-image: url(img/ticket.svg); + position: absolute; + height: 100%; + width: 1.55em; + left: -1.55em; + top: 0; + background-size: contain; + } + } + + #tracking-code { + height: 2.5em; + position: relative; + top: 0.1em; + } + + .introduction { + text-align: center; + + p:nth-child(0) { + color: #198468; + font-size: 150%; + } + } + + .suivi, .en-cours, .creer-compte, .brouillons, .coffre-fort, .historique { + padding: 1rem; + background-color: #d8f0ea; + } + + .summary-count { + font-size: 700%; + font-weight: bold; + color: #3eb397; + } + + .cell-summary { display: block; } + .cell-full { display: none; } +} + +body.page-index #columns { + @media screen and (min-width: $mobile-limit) { + display: grid; + column-gap: 1rem; + grid-template-columns: 1fr 1fr; + } + + #left, #right { + float: none; + width: inherit; + } + + h1, h2, h3, p, form, .cell { + margin: 0; + padding: 0; + } + + h2 { + padding: 0.5em 1rem; + margin: 2em 0 0.7em; + } + + .description, .intro { display: none; } + + #left .cell:nth-child(2n), #right .cell:nth-child(2n+1) { + h2 { background-color: #F4A7AA; } + a { + background-color: #FCE4E5; + color: #c64a59; + } + li.required-authentication a::after { color: #c64a59; } + } + + #left .cell:nth-child(2n+1), #right .cell:nth-child(2n) { + h2 { background-color: #82cebb; } + a { + background-color: #D8F0EA; + color: #198468; + } + li.required-authentication a::after { color: #198468; } + } + + .cell { + margin-bottom: 2em; + + li, h2 { border-radius: 0; } + + a { + display: block; + border: none; + padding: 1em; + margin: 0.3em 0; + text-decoration: underline; + } + } +} + +a.registration.picto::after { + content: ' '; + display: inline-block; + width: 1em; + height: 1em; + background-image: url(img/picto_roue.svg); + background-size: contain; + position: relative; + top: 0.1em; +} + +div#toplinks a.registration { + margin-top: 0.4em; + display: inline-block; +} + +body.page-codesuivi { + #main-content-wrapper { + max-width: 50rem; + margin: 0 auto; + } + + #columns h2 { + color: $red; + font-size: 175%; + padding-left: 0.9rem; + } + + #tracking-code { + height: 2.5em; + position: relative; + top: 0.1em; + } +} + +#messages li, div.infonotice, div.successnotice, div.warningnotice, div.errornotice, form ul.errorlist.nonfield li { + background: transparent; +} + +.tracking-code-part + form, #tracking-code>form { + position: relative; + left: -6em; + z-index: 1; +} + +div.list-of-forms span.form-number { + opacity: inherit; + color: #575757; +} \ No newline at end of file diff --git a/static/rouen/_links.scss b/static/rouen/_links.scss index 0b87371..9c8fcfc 100644 --- a/static/rouen/_links.scss +++ b/static/rouen/_links.scss @@ -95,113 +95,113 @@ a.btlnk { &.complement::after { color: #82CEBB; } } -.E003::after { content: "\e003"; } -.E004::after { content: "\e004"; } -.E005::after { content: "\e005"; } -.E006::after { content: "\e006"; } -.E007::after { content: "\e007"; } -.E008::after { content: "\e008"; } -.E009::after { content: "\e009"; } -.E00A::after { content: "\e00a"; } -.E00B::after { content: "\e00b"; } -.E00C::after { content: "\e00c"; } -.E00D::after { content: "\e00d"; } -.E00E::after { content: "\e00e"; } -.E00F::after { content: "\e00f"; } -.E010::after { content: "\e010"; } -.E011::after { content: "\e011"; } -.E012::after { content: "\e012"; } -.E013::after { content: "\e013"; } -.E014::after { content: "\e014"; } -.E015::after { content: "\e015"; } -.E016::after { content: "\e016"; } -.E017::after { content: "\e017"; } -.E018::after { content: "\e018"; } -.E019::after { content: "\e019"; } -.E01A::after { content: "\e01a"; } -.E01B::after { content: "\e01b"; } -.E01C::after { content: "\e01c"; } -.E01D::after { content: "\e01d"; } -.E01E::after { content: "\e01e"; } -.E01F::after { content: "\e01f"; } -.E020::after { content: "\e020"; } -.E021::after { content: "\e021"; } -.E022::after { content: "\e022"; } -.E023::after { content: "\e023"; } -.E024::after { content: "\e024"; } -.E025::after { content: "\e025"; } -.E026::after { content: "\e026"; } -.E027::after { content: "\e027"; } -.E028::after { content: "\e028"; } -.E029::after { content: "\e029"; } -.E02A::after { content: "\e02a"; } -.E02B::after { content: "\e02b"; } -.E02C::after { content: "\e02c"; } -.E02D::after { content: "\e02d"; } -.E02E::after { content: "\e02e"; } -.E02F::after { content: "\e02f"; } -.E030::after { content: "\e030"; } -.E031::after { content: "\e031"; } -.E032::after { content: "\e032"; } -.E033::after { content: "\e033"; } -.E034::after { content: "\e034"; } -.E035::after { content: "\e035"; } -.E036::after { content: "\e036"; } -.E037::after { content: "\e037"; } -.E038::after { content: "\e038"; } -.E039::after { content: "\e039"; } -.E03A::after { content: "\e03a"; } -.E03B::after { content: "\e03b"; } -.E03C::after { content: "\e03c"; } -.E03D::after { content: "\e03d"; } -.E03E::after { content: "\e03e"; } -.E03F::after { content: "\e03f"; } -.E040::after { content: "\e040"; } -.E041::after { content: "\e041"; } -.E042::after { content: "\e042"; } -.E043::after { content: "\e043"; } -.E044::after { content: "\e044"; } -.E05C::after { content: "\e05c"; } -.E05D::after { content: "\e05d"; } -.E05E::after { content: "\e05e"; } -.E05F::after { content: "\e05f"; } -.E060::after { content: "\e060"; } -.E061::after { content: "\e061"; } -.E062::after { content: "\e062"; } -.E063::after { content: "\e063"; } -.E064::after { content: "\e064"; } -.E065::after { content: "\e065"; } -.E066::after { content: "\e066"; } -.E06E::after { content: "\e06e"; } -.E08E::after { content: "\e08e"; } -.E08F::after { content: "\e08f"; } -.E090::after { content: "\e090"; } -.E09C::after { content: "\e09c"; } -.E09D::after { content: "\e09d"; } -.E09E::after { content: "\e09e"; } -.E09F::after { content: "\e09f"; } -.E0A0::after { content: "\e0a0"; } -.E0A1::after { content: "\e0a1"; } -.E0A2::after { content: "\e0a2"; } -.E0A3::after { content: "\e0a3"; } -.E0A4::after { content: "\e0a4"; } -.E0A5::after { content: "\e0a5"; } -.E0A6::after { content: "\e0a6"; } -.E0A7::after { content: "\e0a7"; } -.E0E9::after { content: "\e0e9"; } -.E0EA::after { content: "\e0ea"; } -.E0EB::after { content: "\e0eb"; } -.E0EC::after { content: "\e0ec"; } -.E0ED::after { content: "\e0ed"; } -.E100::after { content: "\e100"; } -.E101::after { content: "\e101"; } -.E102::after { content: "\e102"; } -.E104::after { content: "\e104"; } -.E105::after { content: "\e105"; } -.E106::after { content: "\e106"; } -.E107::after { content: "\e107"; } -.E108::after { content: "\e108"; } -.E109::after { content: "\e109"; } +a.E003::after { content: "\e003"; } +a.E004::after { content: "\e004"; } +a.E005::after { content: "\e005"; } +a.E006::after { content: "\e006"; } +a.E007::after { content: "\e007"; } +a.E008::after { content: "\e008"; } +a.E009::after { content: "\e009"; } +a.E00A::after { content: "\e00a"; } +a.E00B::after { content: "\e00b"; } +a.E00C::after { content: "\e00c"; } +a.E00D::after { content: "\e00d"; } +a.E00E::after { content: "\e00e"; } +a.E00F::after { content: "\e00f"; } +a.E010::after { content: "\e010"; } +a.E011::after { content: "\e011"; } +a.E012::after { content: "\e012"; } +a.E013::after { content: "\e013"; } +a.E014::after { content: "\e014"; } +a.E015::after { content: "\e015"; } +a.E016::after { content: "\e016"; } +a.E017::after { content: "\e017"; } +a.E018::after { content: "\e018"; } +a.E019::after { content: "\e019"; } +a.E01A::after { content: "\e01a"; } +a.E01B::after { content: "\e01b"; } +a.E01C::after { content: "\e01c"; } +a.E01D::after { content: "\e01d"; } +a.E01E::after { content: "\e01e"; } +a.E01F::after { content: "\e01f"; } +a.E020::after { content: "\e020"; } +a.E021::after { content: "\e021"; } +a.E022::after { content: "\e022"; } +a.E023::after { content: "\e023"; } +a.E024::after { content: "\e024"; } +a.E025::after { content: "\e025"; } +a.E026::after { content: "\e026"; } +a.E027::after { content: "\e027"; } +a.E028::after { content: "\e028"; } +a.E029::after { content: "\e029"; } +a.E02A::after { content: "\e02a"; } +a.E02B::after { content: "\e02b"; } +a.E02C::after { content: "\e02c"; } +a.E02D::after { content: "\e02d"; } +a.E02E::after { content: "\e02e"; } +a.E02F::after { content: "\e02f"; } +a.E030::after { content: "\e030"; } +a.E031::after { content: "\e031"; } +a.E032::after { content: "\e032"; } +a.E033::after { content: "\e033"; } +a.E034::after { content: "\e034"; } +a.E035::after { content: "\e035"; } +a.E036::after { content: "\e036"; } +a.E037::after { content: "\e037"; } +a.E038::after { content: "\e038"; } +a.E039::after { content: "\e039"; } +a.E03A::after { content: "\e03a"; } +a.E03B::after { content: "\e03b"; } +a.E03C::after { content: "\e03c"; } +a.E03D::after { content: "\e03d"; } +a.E03E::after { content: "\e03e"; } +a.E03F::after { content: "\e03f"; } +a.E040::after { content: "\e040"; } +a.E041::after { content: "\e041"; } +a.E042::after { content: "\e042"; } +a.E043::after { content: "\e043"; } +a.E044::after { content: "\e044"; } +a.E05C::after { content: "\e05c"; } +a.E05D::after { content: "\e05d"; } +a.E05E::after { content: "\e05e"; } +a.E05F::after { content: "\e05f"; } +a.E060::after { content: "\e060"; } +a.E061::after { content: "\e061"; } +a.E062::after { content: "\e062"; } +a.E063::after { content: "\e063"; } +a.E064::after { content: "\e064"; } +a.E065::after { content: "\e065"; } +a.E066::after { content: "\e066"; } +a.E06E::after { content: "\e06e"; } +a.E08E::after { content: "\e08e"; } +a.E08F::after { content: "\e08f"; } +a.E090::after { content: "\e090"; } +a.E09C::after { content: "\e09c"; } +a.E09D::after { content: "\e09d"; } +a.E09E::after { content: "\e09e"; } +a.E09F::after { content: "\e09f"; } +a.E0A0::after { content: "\e0a0"; } +a.E0A1::after { content: "\e0a1"; } +a.E0A2::after { content: "\e0a2"; } +a.E0A3::after { content: "\e0a3"; } +a.E0A4::after { content: "\e0a4"; } +a.E0A5::after { content: "\e0a5"; } +a.E0A6::after { content: "\e0a6"; } +a.E0A7::after { content: "\e0a7"; } +a.E0E9::after { content: "\e0e9"; } +a.E0EA::after { content: "\e0ea"; } +a.E0EB::after { content: "\e0eb"; } +a.E0EC::after { content: "\e0ec"; } +a.E0ED::after { content: "\e0ed"; } +a.E100::after { content: "\e100"; } +a.E101::after { content: "\e101"; } +a.E102::after { content: "\e102"; } +a.E104::after { content: "\e104"; } +a.E105::after { content: "\e105"; } +a.E106::after { content: "\e106"; } +a.E107::after { content: "\e107"; } +a.E108::after { content: "\e108"; } +a.E109::after { content: "\e109"; } /* Authentication links */ div#toplinks { diff --git a/static/rouen/_side_block.scss b/static/rouen/_side_block.scss index 20f4fee..56b8fa8 100644 --- a/static/rouen/_side_block.scss +++ b/static/rouen/_side_block.scss @@ -19,7 +19,7 @@ div#tracking-code { margin-bottom: 0; } - h3 { padding: 0; } + h3 { padding: 0; display: block; } a { padding: 0; @@ -55,11 +55,11 @@ body.without-tracking-code div#steps { margin-bottom: 2em; } div#steps { margin-top: 8em; - margin-bottom: 9.5em; + margin-bottom: 11.5em; @media screen and (max-width: $mobile-limit) { margin-top: 0; - margin-bottom: 7.5em; + margin-bottom: 8.5em; } ol { diff --git a/static/rouen/fonts/marsicons12.ttf b/static/rouen/fonts/marsicons12.ttf deleted file mode 100644 index 55be038..0000000 Binary files a/static/rouen/fonts/marsicons12.ttf and /dev/null differ diff --git a/static/rouen/fonts/marsicons12.woff b/static/rouen/fonts/marsicons12.woff deleted file mode 100644 index 6bc87a0..0000000 Binary files a/static/rouen/fonts/marsicons12.woff and /dev/null differ diff --git a/static/rouen/fonts/marsicons12.woff2 b/static/rouen/fonts/marsicons12.woff2 deleted file mode 100644 index b922db0..0000000 Binary files a/static/rouen/fonts/marsicons12.woff2 and /dev/null differ diff --git a/static/rouen/fonts/marsicons13.ttf b/static/rouen/fonts/marsicons13.ttf new file mode 100644 index 0000000..245c1ab Binary files /dev/null and b/static/rouen/fonts/marsicons13.ttf differ diff --git a/static/rouen/fonts/marsicons13.woff b/static/rouen/fonts/marsicons13.woff new file mode 100644 index 0000000..aec8cf7 Binary files /dev/null and b/static/rouen/fonts/marsicons13.woff differ diff --git a/static/rouen/fonts/marsicons13.woff2 b/static/rouen/fonts/marsicons13.woff2 new file mode 100644 index 0000000..f3ddb1e Binary files /dev/null and b/static/rouen/fonts/marsicons13.woff2 differ diff --git a/static/rouen/img/picto_create.svg b/static/rouen/img/picto_create.svg new file mode 100644 index 0000000..fee866f --- /dev/null +++ b/static/rouen/img/picto_create.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/rouen/img/picto_roue.svg b/static/rouen/img/picto_roue.svg new file mode 100644 index 0000000..e6c2fb1 --- /dev/null +++ b/static/rouen/img/picto_roue.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/templates/variants/rouen/authentic2/display_message_and_continue.html b/templates/variants/rouen/authentic2/display_message_and_continue.html index b551cc6..ad906e6 100644 --- a/templates/variants/rouen/authentic2/display_message_and_continue.html +++ b/templates/variants/rouen/authentic2/display_message_and_continue.html @@ -4,7 +4,7 @@ {% block content %}
{% if "logout" in url %} - {% trans "Continue" %} + {% trans "Continue" %} {% else %} {% trans "Continue" %} {% endif %} diff --git a/templates/variants/rouen/combo/page_template.html b/templates/variants/rouen/combo/page_template.html index 2681f6c..dcaa480 100644 --- a/templates/variants/rouen/combo/page_template.html +++ b/templates/variants/rouen/combo/page_template.html @@ -10,7 +10,7 @@ {% if idp_account_url %} - + {% endif %} {{user.first_name}} {{user.last_name}} @@ -36,3 +36,13 @@ {% endif %} {% end_skeleton_extra_placeholder %} {% endblock %} + +{% block content-pre %} +{% if request.path_info == "/" %} + {% if user.is_authenticated %} +
+ Bonjour {{user.first_name}} {{user.last_name}} +
+ {% endif %} +{% endif %} +{% endblock %} diff --git a/templates/variants/rouen/combo/wcs/current_drafts.html b/templates/variants/rouen/combo/wcs/current_drafts.html new file mode 100644 index 0000000..212f87d --- /dev/null +++ b/templates/variants/rouen/combo/wcs/current_drafts.html @@ -0,0 +1,30 @@ +{% load i18n combo %} +{% block cell-content %} +

Mes brouillons en cours

+ +
+
{{ current_drafts.eservices.data|length }}
+
+ Accéder à tous mes brouillons en cours +
+
+ +
+ {% for slug, forms in current_drafts.items %} +
+ {% if forms.data %} + + {% endif %} +
+{% endfor %} +
+{% endblock %} diff --git a/templates/variants/rouen/combo/wcs/current_forms.html b/templates/variants/rouen/combo/wcs/current_forms.html new file mode 100644 index 0000000..44789ed --- /dev/null +++ b/templates/variants/rouen/combo/wcs/current_forms.html @@ -0,0 +1,19 @@ +{% load i18n %} +{% block cell-content %} +

Mes démarches en cours

+ +
+
{{ current_forms.eservices.data|length }}
+
+ Accéder à toutes mes démarches en cours +
+
+ +
+{% for slug, forms in current_forms.items %} +
+ {% include "combo/wcs/list_of_forms.html" with forms=forms %} +
+{% endfor %} +
+{% endblock %} diff --git a/templates/variants/rouen/theme.html b/templates/variants/rouen/theme.html index 8b23487..b4b1b69 100644 --- a/templates/variants/rouen/theme.html +++ b/templates/variants/rouen/theme.html @@ -55,7 +55,7 @@ {% block header-top %}{% endblock %}
{% block header-title %} -

{{ site_title }}

+

{{ site_title }}

{% endblock %} {% if include_top_links != False %} - {% block nav %} - - {% endblock %} - {% block before-main-content %}{% endblock %}