From ea0ad78ae4508661778a85a34878a7d5440c7974 Mon Sep 17 00:00:00 2001 From: RadioPotin Date: Tue, 17 Sep 2024 15:36:32 +0200 Subject: [PATCH] Put ContactUs page back into navbar and more fixes - logo in page headers - CSS for relevant image size - update unaligned logos --- assets/sass/main.scss | 4 ++++ content/en/_index.md | 7 ++++--- content/en/contact.en.md | 15 --------------- content/en/contact.md | 12 ++++++++++++ content/fr/_index.md | 6 +++--- content/fr/contact.fr.md | 16 ---------------- content/fr/contact.md | 12 ++++++++++++ hugo.toml | 1 + layouts/partials/page-header.html | 12 +++++++----- layouts/partials/site-navigation.html | 11 +++++++---- ...ogo_decysif_excellence_for_security_black.svg | 1 - ...xcellence_for_security_blank_bg_rectangle.svg | 2 +- ...sif_security_by_design_blank_bg_rectangle.svg | 1 + 13 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 content/en/contact.en.md create mode 100644 content/en/contact.md delete mode 100644 content/fr/contact.fr.md create mode 100644 content/fr/contact.md delete mode 100644 static/images/logo_decysif_excellence_for_security_black.svg create mode 100644 static/images/logo_decysif_security_by_design_blank_bg_rectangle.svg diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 102cf34..b5f2855 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -11,3 +11,7 @@ p { #sitelogo { max-width: 15rem ; } + +#headerlogo { + max-width: 25rem; +} diff --git a/content/en/_index.md b/content/en/_index.md index 3895eb5..be24613 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -3,11 +3,12 @@ title: "DéCySif" sectiontitle: "Home" cascade: featured_image: '/images/Decysif.png' -description: "Formal verification in the service of safety and security" +description: "**Formal verification in the service of safety and security**" synopsis: "DéCySif is a regional R&D project funded by an i-Démo call and the Ile-de-France French region gathering AdaCore, Inria, OCamlPro and TrustInSoft. Its objective is to improve the safety and security of critical systems using -formal verification tools." +formal verification tools.
The project began on **November 1st 2022** +and will end on **November 1st 2027**." project: sectiontitle: "The project" @@ -37,7 +38,7 @@ project: coordinator: sectiontitle: "Coordinator" content: "TrustInSoft are the coordinators of the project. For any enquiry, - please use the [contact form]({{< ref \"contact.en.md\" >}})." + please use the [contact form]({{< ref \"contact.md\" >}})." publications: - papername: "Formally Verified Rounding Errors of the Logarithm-Sum-Exponential Function" diff --git a/content/en/contact.en.md b/content/en/contact.en.md deleted file mode 100644 index d028e48..0000000 --- a/content/en/contact.en.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Contact -featured_image: '' -omit_header_text: true -description: "Leave us a message!" -type: page -menu: - main: - weight: 3 ---- - -You can contact us by filling the form below. - -{{< form-contact >}} - diff --git a/content/en/contact.md b/content/en/contact.md new file mode 100644 index 0000000..945640a --- /dev/null +++ b/content/en/contact.md @@ -0,0 +1,12 @@ +--- +title: Contact +featured_image: '/images/Decysif.png' +button_text: "Leave us a message!" +layout: contact +description: "**Contact us!**" +--- + +You can contact us by filling the form below. + +{{< form-contact >}} + diff --git a/content/fr/_index.md b/content/fr/_index.md index 81f717c..af627b5 100644 --- a/content/fr/_index.md +++ b/content/fr/_index.md @@ -3,10 +3,10 @@ title: "DéCySif" sectiontitle: "Accueil" cascade: featured_image: '/images/Decysif.png' -description: "La vérification formelle au service de la sécurité et la sûreté" +description: "**La vérification formelle au service de la sécurité et la sûreté**" synopsis: "DéCySif est un projet i-Demo régional de R&D regroupant AdaCore, l'Inria, OCamlPro et TrustInSoft. Il vise à améliorer la sécurité et la sûreté -des systèmes critiques en utilisant des outils de vérification formelle." +des systèmes critiques en utilisant des outils de vérification formelle.
Le projet prendra place du **1er Novembre 2022** au **1er Novembre 2027**." project: sectiontitle: "Le projet" @@ -35,7 +35,7 @@ project: coordinator: sectiontitle: "Coordinateur" content: "La société TrustInSoft est le coordinateur du projet. Pour toute - demande d'information, veuillez passer par le formulaire de [contact]({{< ref \"contact.fr.md\" >}})." + demande d'information, veuillez passer par le formulaire de [contact]({{< ref \"contact.md\" >}})." publications: - papername: "Formally Verified Rounding Errors of the Logarithm-Sum-Exponential Function" diff --git a/content/fr/contact.fr.md b/content/fr/contact.fr.md deleted file mode 100644 index 3f7e2b4..0000000 --- a/content/fr/contact.fr.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Contact -cascade: - featured_image: '/images/Decysif.png' -omit_header_text: true -description: "Laissez-nous un message!" -type: page -menu: - main: - weight: 4 ---- - -Pour nous contacter, merci de remplir le formulaire ci-dessous. - -{{< form-contact >}} - diff --git a/content/fr/contact.md b/content/fr/contact.md new file mode 100644 index 0000000..85a792e --- /dev/null +++ b/content/fr/contact.md @@ -0,0 +1,12 @@ +--- +title: Contact +featured_image: '/images/Decysif.png' +button_text: "Laissez-nous un message !" +layout: contact +description: "**Contactez nous !**" +--- + +Pour nous contacter, merci de remplir le formulaire ci-dessous. + +{{< form-contact >}} + diff --git a/hugo.toml b/hugo.toml index 7d80c36..eb589bf 100644 --- a/hugo.toml +++ b/hugo.toml @@ -26,6 +26,7 @@ Paginate = 10 [params] site_logo = 'images/logo_decysif_excellence_for_security_blank_bg_rectangle.svg' + header_logo = 'images/logo_decysif_security_by_design_blank_bg_rectangle.svg' text_color = "" recent_posts_number = 5 [params.contact] diff --git a/layouts/partials/page-header.html b/layouts/partials/page-header.html index 3891c45..75b1427 100644 --- a/layouts/partials/page-header.html +++ b/layouts/partials/page-header.html @@ -6,11 +6,13 @@ {{ partial "site-navigation.html" . }}
{{ if not .Params.omit_header_text }} -
{{ .Title | default .Site.Title }}
- {{ with .Params.description }} -
- {{ . }} -
+ {{ with .Site.Params.header_logo }} + + {{ end }} + {{ with .Params.description | markdownify }} +
+ {{ . }} +
{{ end }} {{ end }}
diff --git a/layouts/partials/site-navigation.html b/layouts/partials/site-navigation.html index 0afe3bb..6ab21bd 100644 --- a/layouts/partials/site-navigation.html +++ b/layouts/partials/site-navigation.html @@ -1,11 +1,7 @@