From 213597063787877f177e70499418fc1a6fee65e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20Eng=C3=A9libert?= Date: Wed, 12 Apr 2023 09:29:06 +0200 Subject: [PATCH] =?UTF-8?q?M=C3=A0j=20SIRET,=20remplac=C3=A9=20Amatic=20pa?= =?UTF-8?q?r=20Neucha,=20style=20team?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sass/css/base.scss | 4 ++-- sass/css/defs.scss | 5 ----- sass/css/process.scss | 2 +- sass/css/services.scss | 2 +- sass/css/team.scss | 30 ++++++++++++++------------- templates/base.html | 2 +- templates/shortcodes/team_box.html | 33 ++++++++++++++++-------------- 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/sass/css/base.scss b/sass/css/base.scss index 5766b61..8a640cc 100644 --- a/sass/css/base.scss +++ b/sass/css/base.scss @@ -88,12 +88,12 @@ a:hover, a:focus { .slogan1 { font-size: 400%; - font-family: Amatic; + font-family: Neucha; } .slogan2 { font-size: 300%; - font-family: Amatic; + font-family: Neucha; } .slogan3 { diff --git a/sass/css/defs.scss b/sass/css/defs.scss index 61b2185..e44659f 100644 --- a/sass/css/defs.scss +++ b/sass/css/defs.scss @@ -2,11 +2,6 @@ $blue: #0294d9; $violet: #ac44ff; $grey1: #444; -@font-face { - font-family: Amatic; - src: url("/fonts/AmaticSC-Bold.woff2"); -} - @font-face { font-family: LunaSans; src: url("/fonts/LunaSans-Regular.ttf"); diff --git a/sass/css/process.scss b/sass/css/process.scss index f3ca9ad..b808ae2 100644 --- a/sass/css/process.scss +++ b/sass/css/process.scss @@ -1,7 +1,7 @@ @import "defs"; .process-title { - font-family: Amatic; + font-family: Neucha; font-size: 42px; background: linear-gradient(0.25turn, $blue, $violet); color: #fff; diff --git a/sass/css/services.scss b/sass/css/services.scss index fef065a..9c8b70a 100644 --- a/sass/css/services.scss +++ b/sass/css/services.scss @@ -10,7 +10,7 @@ .need_box { flex: 38%; - font-family: Amatic; + font-family: Neucha; font-size: 42px; background: linear-gradient(0.25turn, $blue, $violet); color: #fff; diff --git a/sass/css/team.scss b/sass/css/team.scss index 179d4ba..3456f5c 100644 --- a/sass/css/team.scss +++ b/sass/css/team.scss @@ -4,39 +4,41 @@ display: flex; flex-wrap: wrap; justify-content: space-between; - gap: 16px + gap: 16px; } .team_box { max-width: 434px; + margin: auto; } -.team_box-img_wrap { - float: left; +.team_box-top { + display: flex; + align-items: center; + gap: 16px; } -.team_box-text { - display: inline; -} - -.team_box-text-spacer { - height: 32px; +.team_box-bottom { + clear: both; } .team_box-img { // 70% ~= 1/sqrt(2) mask-image: radial-gradient(circle, #000 69%, transparent 70%); width: 160px; - margin-right: 16px; } .team_box-title { - font-family: Amatic; - font-size: 200%; + font-family: Neucha; + font-size: 150%; } .team_box-subtitle { - font-family: Amatic; - font-size: 150%; + font-family: Neucha; + font-size: 125%; color: $violet; } + +.team_box-description { + margin-top: 8px; +} diff --git a/templates/base.html b/templates/base.html index b85a4c3..d8ef096 100644 --- a/templates/base.html +++ b/templates/base.html @@ -37,7 +37,7 @@ Code source du site sous licence CC BY-SA 4.0 diff --git a/templates/shortcodes/team_box.html b/templates/shortcodes/team_box.html index ea74077..97b154b 100644 --- a/templates/shortcodes/team_box.html +++ b/templates/shortcodes/team_box.html @@ -1,18 +1,21 @@
-
{{title}}
-
-
- {{title|safe}} - {% if place %} - {{place|safe}} - {% endif %} - {% if subtitle %} -
- {{subtitle|safe}} - {% endif %} - {% if description %} -
- {{description|safe}} - {% endif %} +
+ {{title}} +
+ {{title|safe}} + {% if subtitle %} +
+ {{subtitle|safe}} + {% endif %} + {% if place %} +
+ {{place|safe}} + {% endif %} +
+ {% if description %} +
+

{{description|safe}}

+
+ {% endif %}