entrouvert
/
publik-base-theme
15
1
Fork 1
Code Issues Pull Requests 11 Releases Wiki Activity

Merge branch 'main' into wip/71524-notif-icon-align
gitea-wip/publik-base-theme/pipeline/pr-main This commit looks good Details
gitea-wip/publik-base-theme/pipeline/head Build started... Details
gitea/publik-base-theme/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Thomas Jund 2022-11-28 15:51:21 +01:00
parent c6befbe3dc ff65064dcd
commit 1ccb1e1de9
14 changed files with 136 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
README
View File

@ -147,6 +147,14 @@ copyright notices:
#
# https://www.fontsquirrel.com/license/khand
* Archivo Black
# Copyright (c) 2012-2015, Omnibus-Type (www.omnibus-type.com|omnibus.type@gmail.com)
# with Reserved Font Name "Archivo Black";
#
# This Font Software is licensed under the SIL Open Font License, Version 1.1.
#
# https://www.fontsquirrel.com/license/archivo-black
* Archivo Narrow
# Copyright (c) 2012, Omnibus-Type (omnibus.type@gmail.com),
# with Reserved Font Name "Archivo";
@ -394,6 +402,13 @@ copyright notices:
#
# https://www.fontsquirrel.com/license/rubik
* Viga
# Copyright (c) 2011 Fontstage (info@fontstage.com), with Reserved Font Name “Viga”
#
# This Font Software is licensed under the SIL Open Font License, Version 1.1.
#
# https://www.fontsquirrel.com/license/viga
* Manrope
# Copyright 2018 The Manrope Project Authors. All rights reserved
#

11
static/bouches-du-rhone/config.json
View File

@ -93,7 +93,16 @@
"log_errors" : false,
"name" : "RSA Extranet : bénéficiaire",
"url" : "{{ passerelle_url }}rsa13/{% firstof slug rsa13_slug \"rsa\" %}/platform/{{ plateforme_id }}/beneficiaire/{{ brsa_id }}/?email={{ user_email }}&ip={{ request.META.REMOTE_ADDR }}",
"varnames" : []
"varnames" : [],
"additional-data" : [
{
"cache_duration" : 0,
"key" : "platforms",
"log_errors" : false,
"timeout" : 10,
"url" : "{{ passerelle_url }}rsa13/{% firstof slug rsa13_slug \"rsa\" %}/platform?email={{ user_email }}&ip={{ request.META.REMOTE_ADDR }}"
}
]
},
"rsa13-beneficiaire-action" : {
"cache_duration" : 0,

BIN
static/fonts/ArchivoBlack/archivoblack-italic-webfont.woff2 Normal file
View File

Binary file not shown.

BIN
static/fonts/ArchivoBlack/archivoblack-normal-webfont.woff2 Normal file
View File

Binary file not shown.

BIN
static/fonts/Viga/viga-regular-webfont.woff2 Normal file
View File

Binary file not shown.

1
static/includes/_forms.scss
View File

@ -321,6 +321,7 @@ select {
input[type="checkbox"],
input[type="radio"] {
padding: 0;
margin-right: 0.7em;
margin-bottom: 0.7em;
&:focus {

11
static/includes/fonts/_archivo-black.scss Normal file
View File

@ -0,0 +1,11 @@
@mixin archivoblack-font($style) {
@font-face {
font-family: 'Archivo Black';
src: url('/static/fonts/ArchivoBlack/archivoblack-#{$style}-webfont.woff2') format('woff2');
font-weight: 400;
font-style: $style;
}
}
@include archivoblack-font(normal);
@include archivoblack-font(italic);

6
static/includes/fonts/_viga.scss Normal file
View File

@ -0,0 +1,6 @@
@font-face {
font-family: 'Viga';
src: url('/static/fonts/Viga/viga-regular-webfont.woff2') format('woff2');
font-weight: 400;
font-style: regular;
}

3
static/includes/wcs/_bulk.scss
View File

@ -356,8 +356,9 @@ div.dataview {
margin-top: 0;
margin-bottom : 0;
}
span.label {
.label {
font-weight: bold;
margin: 0;
}
.value {
display: block;

1
static/leplessistrevise/_custom.scss
View File

@ -188,7 +188,6 @@ div.wcs-form-cell {
}
div#rub_service {
background: darken(white, 3%);
border-radius: $cell-border-radius;
h3 { color: $primary-color; }
&.form-content--body {

1
static/leplessistrevise/_vars.scss
View File

@ -16,6 +16,7 @@ $border-radius: 0px;
$mobile-limit: 1250px;
$width: 1200px;
$mobile-width: 100%;
$form-background: darken(white, 3%);
$show-site-title: true;

53
templates/hobo/maintenance/maintenance_page.html
View File

@ -1,8 +1,53 @@
<!DOCTYPE html>
{% load i18n %}
<html>
<html {% if LANGUAGE_CODE %}lang="{{ LANGUAGE_CODE }}"{% endif %} {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
<meta charset="UTF-8"><!-- 🔥 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% firstof global_title "Compte Citoyen" %}</title>
</head>
<body>
<h1>{% trans "This site is currently unavailable." %}</h1>
<p>{{ maintenance_message|default:"" }}</p>
<main>
<h1>{% firstof global_title "Compte Citoyen" %}</h1>
<p><strong>{% trans "This site is currently unavailable." %}</strong></p>
<p>{{ maintenance_message|default:"" }}</p>
</main>
</body>
<style>
html, body {
margin: 0;
padding: 0;
font-family: sans-serif;
background: #eee;
color: black;
font-size: 100%;
}
body {
width: 100%;
height: 100vh;
display: flex;
justify-content: center;
}
main {
border: 5px solid {% firstof theme_color black %};
margin: auto auto;
padding: 1em;
max-width: 70ex;
flex: 1;
background: white;
}
h1 {
margin-top: 0;
border-bottom: 2px solid {% firstof theme_color black %};
font-size: 200%;
}
p {
font-size: 120%;
}
</style>
</html>

14
templates/variants/bouches-du-rhone/combo/json/rsa13-beneficiaire.html
View File

@ -1,5 +1,4 @@
{% load combo %}
{% if not json.err and json.data %}
{% with json.data as data %}
@ -27,7 +26,16 @@
<p>Conjoint :&nbsp;
{% if data.actif == "Oui" %}
{% if data.conjoint.nom %}
<strong>{{ data.conjoint.nom|upper }} {{ data.conjoint.prenom|default:"(Pas de prénom renseigné)" }}{% if data.conjoint.age %} - {{ data.conjoint.age }}{% endif %}</strong>
{% if data.conjoint.plateforme.id in platforms.data|getlist:"id"|list %}
<strong><a href="{{ portal_url }}portail-extranet-rsa/plateforme/{{ data.conjoint.plateforme.id }}/beneficiaire-rsa/{{ data.conjoint.id }}/">{{ data.conjoint.nom|upper }} {{ data.conjoint.prenom|default:"(Pas de prénom renseigné)" }}{% if data.conjoint.age %} - {{ data.conjoint.age }}{% endif %}</a></strong>
{% else %}
<strong>{{ data.conjoint.nom|upper }} {{ data.conjoint.prenom|default:"(Pas de prénom renseigné)" }}{% if data.conjoint.age %} - {{ data.conjoint.age }}{% endif %}</strong>
{% endif %}
{% if data.conjoint.plateforme.id %}
<div>Affectation conjoint : <strong>{{ data.conjoint.plateforme.text }}</strong></div>
<div>Référent conjoint : <strong>{{ data.conjoint.referent|default:"Non renseigné" }}</strong></div>
{% endif %}
<div>Activité conjoint : <strong>{{ data.conjoint.activite|default:"Pas d'activité renseignée" }}</strong></div>
{% else %}
<strong>Aucun</strong>
{% endif %}
@ -41,7 +49,7 @@
{% if data.enfants %}<strong>{{ data.enfants|length }}</strong>
<strong>
<ul>
{% for enfant in data.enfants %}<li>{{ enfant.nom|upper|default:"Pas de nom renseigné" }} {{ enfant.prenom|default:"Pas de prénom renseigné" }}{% if enfant.age %} - {{ enfant.age }}{% endif %}</li>{% endfor %}
{% for enfant in data.enfants %}<li>{{ enfant.nom|upper|default:"Pas de nom renseigné" }} {{ enfant.prenom|default:"Pas de prénom renseigné" }}{% if enfant.age %} - {{ enfant.age }} - {{ enfant.activite|default:"Pas d'activité renseignée" }}{% endif %}</li>{% endfor %}
</ul>
</strong>
{% else %}

58
templates/wcs/front/formdata_steps.html
View File

@ -1,30 +1,32 @@
<header id="steps" class="wcs-steps steps-{{page_labels|length}}">
<ol class="wcs-steps--list">
{% for page_label in page_labels %}
{% spaceless %}
<li {% if forloop.counter != current_page_no %}aria-hidden="true"{% endif %}
class="wcs-step
{% if forloop.first %}first{% endif %}
{% if forloop.last %}last{% endif %}
{% if forloop.counter == current_page_no %}current{% endif %}
{% if forloop.counter < current_page_no %}step-before{% endif %}
{% if forloop.counter > current_page_no %}step-after{% endif %}" >
<abbr
{% if forloop.counter == current_page_no %}
aria-label="Étape {{ forloop.counter }} sur {{ page_labels|length }}:"
title="Étape {{ forloop.counter }} sur {{ page_labels|length }}"
{% endif %}
class="marker wcs-step--marker">
<span class="wcs-step--marker-nb">
{{ forloop.counter }}
</span>
<span class="wcs-step--marker-total">
{{ page_labels|length }}
</span>
</abbr>
<span class="label wcs-step--label">{{ page_label }}</span>
</li>
{% endspaceless %}
{% endfor %}
</ol>
{% block steps-list %}
<ol class="wcs-steps--list">
{% for page_label in page_labels %}
{% spaceless %}
<li {% if forloop.counter != current_page_no %}aria-hidden="true"{% endif %}
class="wcs-step
{% if forloop.first %}first{% endif %}
{% if forloop.last %}last{% endif %}
{% if forloop.counter == current_page_no %}current{% endif %}
{% if forloop.counter < current_page_no %}step-before{% endif %}
{% if forloop.counter > current_page_no %}step-after{% endif %}" >
<abbr
{% if forloop.counter == current_page_no %}
aria-label="Étape {{ forloop.counter }} sur {{ page_labels|length }}:"
title="Étape {{ forloop.counter }} sur {{ page_labels|length }}"
{% endif %}
class="marker wcs-step--marker">
<span class="wcs-step--marker-nb">
{{ forloop.counter }}
</span>
<span class="wcs-step--marker-total">
{{ page_labels|length }}
</span>
</abbr>
<span class="label wcs-step--label">{{ page_label }}</span>
</li>
{% endspaceless %}
{% endfor %}
</ol>
{% endblock %}
</header>