From c545c335496070b7a23a40d16ca63205cc6c0b39 Mon Sep 17 00:00:00 2001 From: RadioPotin Date: Wed, 18 Sep 2024 19:30:08 +0200 Subject: [PATCH] Update CSS, Add Deliverables page w/ resources, adapt datasets --- assets/js/hamburger.js | 6 + assets/sass/main.scss | 349 +++++++++++++++++- content/en/_index.md | 4 - content/en/deliverables.md | 42 +++ .../en/post/00_kickoff_of_project_decysif.md | 2 +- content/en/post/_index.md | 1 + content/fr/_index.md | 15 +- content/fr/deliverables.md | 42 +++ .../fr/post/00_kickoff_of_project_decysif.md | 2 +- layouts/index.html | 153 +++----- layouts/page/deliverables.html | 113 ++++++ layouts/partials/site-footer.html | 2 + layouts/partials/site-header.html | 49 ++- layouts/partials/site-navigation.html | 87 +++-- static/pdf/livrable_l1_1.pdf | Bin 0 -> 327565 bytes static/pdf/livrable_l2_1.pdf | Bin 0 -> 348455 bytes 16 files changed, 682 insertions(+), 185 deletions(-) create mode 100644 assets/js/hamburger.js create mode 100644 content/en/deliverables.md create mode 100644 content/fr/deliverables.md create mode 100644 layouts/page/deliverables.html create mode 100644 static/pdf/livrable_l1_1.pdf create mode 100644 static/pdf/livrable_l2_1.pdf diff --git a/assets/js/hamburger.js b/assets/js/hamburger.js new file mode 100644 index 0000000..d1564e1 --- /dev/null +++ b/assets/js/hamburger.js @@ -0,0 +1,6 @@ +document.getElementById('menu-button').addEventListener('onclick', function () { + var menu = document.getElementById('main-navigation'); + var expanded = this.getAttribute('aria-expanded') === 'true' || false; + this.setAttribute('aria-expanded', !expanded); + menu.classList.toggle('db'); +}); diff --git a/assets/sass/main.scss b/assets/sass/main.scss index b5f2855..be4b18c 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -1,13 +1,152 @@ -p { - text-align: justify; - text-justify: auto; +// Global header styles +.site-header { + width: 100%; + position: relative; + z-index: 1; + + // Default background color for headers without images + &.header-no-image { + background-color: #1a1a1a; + padding: 3rem 1rem; + } + + // Cover style for headers with a background image + .header-cover { + background-size: cover; + background-position: center; + background-repeat: no-repeat; + height: 60vh; + display: flex; + align-items: center; + justify-content: center; + position: relative; + + // Ensure text is readable + &::after { + content: ""; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.6); // Adjust darkness here + z-index: 1; + } + } + + // Header content wrapper (titles, etc.) + .header-content { + position: relative; + z-index: 2; // Ensure content is above the overlay + text-align: center; + padding: 2rem 1rem; + + @media screen and (min-width: 48em) { + padding: 4rem 2rem; + } + } + + // Main title (h1) + .header-title { + font-size: 2.5rem; + font-weight: 700; + color: #fff; + text-transform: uppercase; + + @media screen and (min-width: 48em) { + font-size: 3.5rem; + } + + @media screen and (min-width: 64em) { + font-size: 4.5rem; + } + } + + // Subtitle (h2) + .header-subtitle { + font-size: 1.25rem; + font-weight: 300; + color: #eaeaea; + max-width: 40rem; + margin: 0 auto; + + @media screen and (min-width: 48em) { + font-size: 1.5rem; + } + + @media screen and (min-width: 64em) { + font-size: 1.75rem; + } + } +} + +// Responsive typography for better mobile experience +h1, h2 { + line-height: 1.2; + margin-bottom: 1rem; +} + +// Padding and spacing for different screen sizes +@media screen and (min-width: 48em) { + .site-header { + padding: 6rem 3rem; + } + + .header-content { + padding: 6rem 3rem; + } } -.pv5 { - padding-top: 1rem; - padding-bottom: 1rem; + +section { + padding: 4rem 0; + + h2 { + font-size: 1.75rem; + margin-bottom: 2rem; + } + + p { + font-size: 1.125rem; + line-height: 1.75rem; + } + + img { + display: block; + margin: 2rem auto; + max-width: 100%; + height: auto; + } + + &.bg-light-gray { + background-color: #f4f4f4; + } + + &.bg-near-white { + background-color: #fafafa; + } + + a { + color: #007aff; + text-decoration: underline; + + &:hover { + color: #0056b3; + } + } + + .consortium { + display: flex; + flex-wrap: wrap; + + &__item { + flex: 1 1 50%; + padding: 1rem; + } + } } + #sitelogo { max-width: 15rem ; } @@ -15,3 +154,201 @@ p { #headerlogo { max-width: 25rem; } + +// Styling for the main deliverables and publications container +.deliverables, .publications { + margin-top: 2rem; + padding: 0 1rem; + + // Lots and publications containers + .lots, .publication-list { + margin-top: 2rem; + + // Individual deliverables (papers) and publications + .paper, .publication { + background-color: #f9f9f9; + border: 1px solid #e2e2e2; + padding: 1.5rem; + margin-bottom: 1.5rem; + border-radius: 8px; + transition: all 0.3s ease; + + // Box shadow on hover for a subtle effect + &:hover { + box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1); + transform: translateY(-3px); + } + + // Headings for each paper or publication + h5, h4 { + color: #0070f3; + font-size: 1.1rem; + font-weight: 600; + margin-bottom: 0.75rem; + } + + // Synopsis and other smaller text elements + p { + font-size: 0.95rem; + margin-bottom: 0.5rem; + line-height: 1.6; + + &.i { + font-style: italic; + color: #555; + } + } + + // List of authors (styled as a neat bullet list) + ul { + margin-top: 0.5rem; + margin-bottom: 0.75rem; + list-style-type: disc; + padding-left: 1.5rem; + color: #333; + + li { + font-size: 0.95rem; + margin-bottom: 0.25rem; + } + } + + // Links for PDF download or publication + a { + color: #0070f3; + font-weight: 500; + text-decoration: none; + border-bottom: 1px solid #0070f3; + transition: all 0.2s ease; + + &:hover { + color: #0056b3; + border-color: #0056b3; + } + } + } + } +} + +// Title and section headings +h2, h3 { + text-transform: uppercase; + letter-spacing: 0.05em; + color: #333; + margin-bottom: 1rem; +} + +// Title for lots and publications within each section +h4, h5 { + color: #333; + font-size: 1.2rem; + font-weight: 600; + margin-bottom: 0.75rem; +} + +nav { + color: #fff; + + .menu-toggle { + display: none; + + @media (max-width: 64em) { // For medium and smaller screens + display: block; + } + + button.hamburger-button { + background: none; + border: none; + cursor: pointer; + padding: 0; + width: 30px; + height: 30px; + position: relative; + + .hamburger-icon { + display: block; + width: 30px; + height: 3px; + background-color: white; + position: relative; + + &::before, + &::after { + content: ''; + width: 30px; + height: 3px; + background-color: white; + position: absolute; + left: 0; + transition: all 0.3s ease; + } + + &::before { + top: -10px; + } + + &::after { + bottom: -10px; + } + } + + &[aria-expanded="true"] .hamburger-icon { + background-color: transparent; + + &::before { + transform: rotate(45deg); + top: 0; + } + + &::after { + transform: rotate(-45deg); + bottom: 0; + } + } + } + } + + .nav-links { + display: flex; + list-style: none; + padding: 0; + margin: 0; + + @media (max-width: 64em) { + display: none; + flex-direction: column; + width: 100%; + background-color: #333; + padding: 1rem 0; + + li { + padding: 0.75rem 1.5rem; + text-align: center; + + a { + width: 100%; + display: inline-block; + } + } + + &[aria-expanded="true"] { + display: flex; + } + } + + li { + margin: 0; + + a { + text-decoration: none; + color: white; + padding: 0.75rem 1rem; + transition: background-color 0.2s ease; + + &:hover { + background-color: #444; + } + } + } + } +} diff --git a/content/en/_index.md b/content/en/_index.md index be24613..ba188ae 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -40,10 +40,6 @@ coordinator: content: "TrustInSoft are the coordinators of the project. For any enquiry, please use the [contact form]({{< ref \"contact.md\" >}})." -publications: - - papername: "Formally Verified Rounding Errors of the Logarithm-Sum-Exponential Function" - url: "https://inria.hal.science/hal-04674600" - software: sectiontitle: "Our software" tools: diff --git a/content/en/deliverables.md b/content/en/deliverables.md new file mode 100644 index 0000000..c14e24b --- /dev/null +++ b/content/en/deliverables.md @@ -0,0 +1,42 @@ +--- +layout: "deliverables" +description: "**Formal verification in the service of safety and security**" +title: "Deliverables" +synopsis: "The DéCySif project provides a framework for the consortium to produce a set of deliverables as well as a series of diverse scientific papers, which will be compiled below as they are published." +project_deliverables: + repository: "https://github.com/Decysif/livrables/tree/master" + lots: + - lot_nb: "Lot 1" + papers: + - id: "L1.1" + name: "Constitution d’une base de fichiers d’entrée représentatifs des difficultés rencontrées pour générer des exploits." + synopsys: "Soon" + leader: "TrustInSoft" + authors: + - "Guillaume Cluzel (TrustInSoft)" + - "Matteo Manighetti (Inria & Université Paris-Saclay)" + - "Claude Marché (Inria & Université Paris-Saclay)" + - "Yannick Moy (AdaCore)" + pdf_url: "/pdf/livrable_l1_1.pdf" + - id: "L2.1" + name: "Constitution d’une base de fichiers d’entrée représentatifs des difficultés rencontrées pour la preuve automatique." + synopsys: "Soon" + leader: "AdaCore" + authors: + - "Yannick Moy (AdaCore)" + - "Guillaume Cluzel (TrustInSoft)" + - "Matteo Manighetti (Inria & Université Paris-Saclay)" + - "Claude Marché (Inria & Université Paris-Saclay)" + pdf_url: "/pdf/livrable_l2_1.pdf" + +publications: + - papername: "Formally Verified Rounding Errors of the Logarithm-Sum-Exponential Function" + url: "https://inria.hal.science/hal-04674600" + date: "2024" + authors: + - "Paul Bonnot" + - "Benoît Boyer" + - "Florian Faissole" + - "Claude Marché" + - "Raphaël Rieu-Helft" +--- diff --git a/content/en/post/00_kickoff_of_project_decysif.md b/content/en/post/00_kickoff_of_project_decysif.md index a4b88ee..5e0c46b 100644 --- a/content/en/post/00_kickoff_of_project_decysif.md +++ b/content/en/post/00_kickoff_of_project_decysif.md @@ -1,6 +1,6 @@ --- date: 2023-12-19T10:58:08-04:00 -description: "Project members meet for the launch!" +description: "**Project members meet for the launch!**" featured_image: '/images/Decysif.png' thumbnail: '/images/logo_decysif_excellence_for_security_white.svg' tags: ["key", "event"] diff --git a/content/en/post/_index.md b/content/en/post/_index.md index 1731310..01689a3 100644 --- a/content/en/post/_index.md +++ b/content/en/post/_index.md @@ -2,6 +2,7 @@ title: "News" date: 2017-03-02T12:00:00-05:00 type: page +description: "**Formal verification in the service of safety and security**" featured_image: '/images/Decysif.png' --- Read the latest updates on the project right here! diff --git a/content/fr/_index.md b/content/fr/_index.md index af627b5..e9f3ecd 100644 --- a/content/fr/_index.md +++ b/content/fr/_index.md @@ -37,10 +37,6 @@ coordinator: content: "La société TrustInSoft est le coordinateur du projet. Pour toute 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" - url: "https://inria.hal.science/hal-04674600" - software: sectiontitle: "Les logiciels" tools: @@ -193,4 +189,15 @@ collaborators: sont déployées dans le monde entier chez les développeurs et intégrateurs de composants logiciels issus des industries aéronautique, automobile, ferroviaire, militaire, nucléaire, télécoms, ou l'IoT." + +project_deliverables: + sectiontitle: "Deliverables" + deliverables: + - id: "L1.1" + name: "Surprisingly, turning it off and on again does work." + synopsys: "Science goes brrr" + leader: "Mrs. Science" + url: "lien vers github ?" + - ... + --- diff --git a/content/fr/deliverables.md b/content/fr/deliverables.md new file mode 100644 index 0000000..3791f12 --- /dev/null +++ b/content/fr/deliverables.md @@ -0,0 +1,42 @@ +--- +layout: "deliverables" +description: "**La vérification formelle au service de la sécurité et la sûreté**" +title: "Livrables" +synopsis: "Le projet DéCySif fourni un cadre pour que le consortium puisse aboutir à un ensemble de livrables ainsi qu'une suite de papiers scientifiques divers qui seront réunis ci-dessous à mesure qu'ils voient le jour." +project_deliverables: + repository: "https://github.com/Decysif/livrables/tree/master" + lots: + - lot_nb: "Lot 1" + papers: + - id: "L1.1" + name: "Constitution d’une base de fichiers d’entrée représentatifs des difficultés rencontrées pour générer des exploits." + synopsys: "Bientôt" + leader: "TrustInSoft" + authors: + - "Guillaume Cluzel (TrustInSoft)" + - "Matteo Manighetti (Inria & Université Paris-Saclay)" + - "Claude Marché (Inria & Université Paris-Saclay)" + - "Yannick Moy (AdaCore)" + pdf_url: "/pdf/livrable_l1_1.pdf" + - id: "L2.1" + name: "Constitution d’une base de fichiers d’entrée représentatifs des difficultés rencontrées pour la preuve automatique." + synopsys: "Bientôt" + leader: "AdaCore" + authors: + - "Yannick Moy (AdaCore)" + - "Guillaume Cluzel (TrustInSoft)" + - "Matteo Manighetti (Inria & Université Paris-Saclay)" + - "Claude Marché (Inria & Université Paris-Saclay)" + pdf_url: "/pdf/livrable_l2_1.pdf" + +publications: + - papername: "Formally Verified Rounding Errors of the Logarithm-Sum-Exponential Function" + url: "https://inria.hal.science/hal-04674600" + date: "2024" + authors: + - "Paul Bonnot" + - "Benoît Boyer" + - "Florian Faissole" + - "Claude Marché" + - "Raphaël Rieu-Helft" +--- diff --git a/content/fr/post/00_kickoff_of_project_decysif.md b/content/fr/post/00_kickoff_of_project_decysif.md index d2a1305..844b824 100644 --- a/content/fr/post/00_kickoff_of_project_decysif.md +++ b/content/fr/post/00_kickoff_of_project_decysif.md @@ -2,7 +2,7 @@ date: 2023-12-19T10:58:08-04:00 description: "Les membres du projet se réunissent au lancement du projet !" featured_image: '/images/Decysif.png' -thumbnail: '/images/logo_decysif_excellence_for_security_black.svg' +thumbnail: '/images/logo_decysif_excellence_for_security_white.svg' tags: ["événement","clé"] title: "Diagnostic de Cyber-Sécurité Formel: DéCySif" --- diff --git a/layouts/index.html b/layouts/index.html index 94e9527..fea5ab8 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,123 +1,58 @@ {{ define "header" }}{{ partial "page-header.html" . }}{{ end }} {{ define "main" }}
+
+
+

{{ .Params.synopsis | markdownify }}

+
+
- -
-
-

- {{ .Params.sectiontitle }} -

-
- {{ .Params.synopsis | markdownify }} -
-
-
-
-
+
+
+

{{ .Params.project.sectiontitle }}

+

{{ .Params.project.content | markdownify }}

+ {{ .Params.project.img.alt }} +
+
- -
-
-

- {{ .Params.project.sectiontitle }} -

-
- {{ .Params.project.content | markdownify}} -
-
- {{ .Params.project.img.alt }} -
-

- {{ .Params.coordinator.sectiontitle }} -

- -
- {{ .Params.coordinator.content | markdownify}} -
-
    - {{ if (eq .Site.Language.Lang "fr") }} -

    - Publications Scientifiques -

    - {{ else }} -

    - Scientific Papers -

    - {{ end }} - {{ range $.Params.publications }} -
  • - {{ .papername }} -
    • - {{ end }} -
-
-
+
+
+

{{ .Params.coordinator.sectiontitle }}

+

{{ .Params.coordinator.content | markdownify }}

+
+
- -
-
-
-

- {{ .Params.software.sectiontitle }} -

-
-
- {{ range $.Params.software.tools }} -
-
-

- {{ .name }} -

-
-
-

- {{ .description | markdownify }} -

-
-
-
    - {{ range .url }} -
  • - {{ . }} -
    • - {{ end }} -
-
-
+
+
+

{{ .Params.software.sectiontitle }}

+
+ {{ range .Params.software.tools }} +
+

{{ .name }}

+ {{ range .url }} + {{ . }}
+ {{ end }} +

{{ .description | markdownify }}

+
{{ end }}
-
-
+ + - -
-
-
-

- {{ .Params.collaborators.sectiontitle }} -

-
-
- {{ range $.Params.collaborators.consortium }} -
-
-

{{ .name }}

-
-
-

- {{ .description | markdownify }} -

-
-
- {{ .url }} -
-
+
+
+

{{ .Params.collaborators.sectiontitle }}

+
+ {{ range .Params.collaborators.consortium }} +
+

{{ .name }}

+ {{ .url }} +

{{ .description | markdownify }}

+
{{ end }}
-
-
- + +
{{ end }} diff --git a/layouts/page/deliverables.html b/layouts/page/deliverables.html new file mode 100644 index 0000000..3fabbea --- /dev/null +++ b/layouts/page/deliverables.html @@ -0,0 +1,113 @@ +{{ define "header" }}{{ partial "page-header.html" . }}{{ end }} +{{ define "main" }} +
+
+

+ {{ .Params.title }} +

+

{{ .Params.synopsis }}

+ + +
+

+ {{ if (eq .Site.Language.Lang "fr") }} + Livrables du projet + {{ else }} + Project Deliverables + {{ end }} +

+ + {{ if (eq .Site.Language.Lang "fr") }} + Dépôt + {{ else }} + Repository + {{ end }} + + +
+ {{ range .Params.project_deliverables.lots }} +
+

{{ .lot }}

+
+ {{ range .papers }} +
+
{{ .id }} - {{ .name }}
+

{{ .synopsys }}

+

+ {{ if (eq .Site.Language.Lang "fr") }} + Dirigé par: {{ .leader }} + {{ else }} + Led by: {{ .leader }} + {{ end }} +

+

+ {{ if (eq .Site.Language.Lang "fr") }} + Auteurs: + {{ else }} + Authors: + {{ end }} +

+
    + {{ range .authors }} +
  • {{ . }}
    • + {{ end }} +
+ + {{ if (eq .Site.Language.Lang "fr") }} + Télécharger la version PDF + {{ else }} + Download PDF version (French) + {{ end }} + +
+ {{ end }} +
+
+ {{ end }} +
+
+ + +
+

+ Publications +

+ +
+ {{ range .Params.publications }} +
+

{{ .papername }}

+

+ {{ if (eq .Site.Language.Lang "fr") }} + Publié: {{ .date }} + {{ else }} + Published: {{ .date }} + {{ end }} +

+

+ {{ if (eq .Site.Language.Lang "fr") }} + Auteurs: + {{ else }} + Authors: + {{ end }} +

+
    + {{ range .authors }} +
  • {{ . }}
    • + {{ end }} +
+ + {{ if (eq .Site.Language.Lang "fr") }} + Lire la publication + {{ else }} + Read Publication + {{ end }} + +
+ {{ end }} +
+
+
+ +
+{{ end }} diff --git a/layouts/partials/site-footer.html b/layouts/partials/site-footer.html index 11fb145..89c1b2a 100644 --- a/layouts/partials/site-footer.html +++ b/layouts/partials/site-footer.html @@ -6,4 +6,6 @@
{{ .Site.Param "legal" }}
{{ partial "social-follow.html" . }}
+ {{ $hamburgerJS := resources.Get "js/hamburger.js" | minify | fingerprint }} + diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html index 1a0b3cb..01bd2e6 100644 --- a/layouts/partials/site-header.html +++ b/layouts/partials/site-header.html @@ -1,35 +1,34 @@ {{ $featured_image := partial "func/GetFeaturedImage.html" . }} -{{ if $featured_image }} - {{/* Trimming the slash and adding absURL make sure the image works no matter where our site lives */}} -
+
+ {{ if $featured_image }} +
{{ partial "site-navigation.html" .}} -
-

+
+

{{ .Title | default .Site.Title }}

{{ with .Params.description }} -

- {{ . }} -

+

+ {{ . }} +

{{ end }}

-
-{{ else }} -
-
- {{ partial "site-navigation.html" . }} -
-

- {{ .Title | default .Site.Title }} -

- {{ with .Params.description }} -

- {{ . }} -

- {{ end }} -
+
+ {{ else }} +
+ {{ partial "site-navigation.html" . }} +
+

+ {{ .Title | default .Site.Title }} +

+ {{ with .Params.description }} +

+ {{ . }} +

+ {{ end }}
-
-{{ end }} + + {{ end }} +
diff --git a/layouts/partials/site-navigation.html b/layouts/partials/site-navigation.html index 6ab21bd..61e24af 100644 --- a/layouts/partials/site-navigation.html +++ b/layouts/partials/site-navigation.html @@ -1,43 +1,60 @@ -