From 0be3000b95ae7cf000f24ddfbcdad27039ab2c52 Mon Sep 17 00:00:00 2001 From: williambelle Date: Tue, 21 May 2024 13:30:14 +0000 Subject: [PATCH] deploy: 26e2ecf809e79b4c5f412ac6591bc45ff32e63a3 --- .../atoms/picture/picture-news-thumb.twig | 11 + .../news/news-horizontal-listing-gray.twig | 36 +++ .../news/news-horizontal-listing.twig | 36 +++ components/content-types/news/news.yml | 7 + .../breadcrumb/breadcrumb-dropdown.twig | 69 +++++ .../breadcrumb/breadcrumb-tagged.twig | 63 ++++- .../molecules/breadcrumb/breadcrumb.twig | 10 +- .../molecules/breadcrumb/breadcrumb.yml | 4 + .../key-number/key-number-hn-link.twig | 23 ++ .../molecules/key-number/key-number-hn.twig | 23 ++ .../molecules/key-number/key-number.yml | 4 + .../list-group/list-group-teasers.twig | 36 ++- components/organisms/footer/footer-legal.twig | 15 +- .../key-number-group/key-number-group-hn.twig | 7 + .../key-number-group/key-number-group.yml | 3 + components/organisms/nav-aside/nav-aside.twig | 14 +- components/organisms/nav-aside/nav-aside.yml | 4 + .../organisms/nav-mobile/nav-mobile.twig | 24 ++ .../organisms/nav-mobile/nav-mobile.yml | 5 + components/pages/about/about.twig | 2 + .../association-list/association-list.twig | 2 + components/pages/blog-single/blog-single.twig | 27 +- .../pages/lab-homepage/lab-homepage.twig | 8 +- components/pages/news-detail/news-detail.twig | 46 ++-- .../pages/news-homepage/news-homepage.twig | 1 + .../study-plan-course/study-plan-course.twig | 32 ++- components/pages/study-plan/study-plan.twig | 28 +- components/templates/base/base.twig | 19 +- css/elements.css | 252 ++++++++++++++++-- css/elements.min.css | 2 +- css/elements.min.css.map | 2 +- css/reader.css | 6 +- css/reader.min.css | 2 +- css/reader.min.css.map | 2 +- images/icons/icon-teaser-video.svg | 1 + ...thumb-120x58.jpg => news_thumb-120x68.jpg} | Bin .../news-thumbs/news_thumb_02-1080x608.jpg | Bin 0 -> 203871 bytes .../news-thumbs/news_thumb_02-120x68.jpg | Bin 0 -> 6960 bytes .../news-thumbs/news_thumb_02-160x90.jpg | Bin 0 -> 10422 bytes .../news-thumbs/news_thumb_02-190x107.jpg | Bin 0 -> 13637 bytes .../news-thumbs/news_thumb_02-240x135.jpg | Bin 0 -> 19141 bytes .../news-thumbs/news_thumb_02-540x304.jpg | Bin 0 -> 73299 bytes .../news-thumbs/news_thumb_02-80x45.jpg | Bin 0 -> 3986 bytes .../news-thumbs/news_thumb_02-95x53.jpg | Bin 0 -> 4887 bytes js/elements.js | 71 ++--- js/elements.min.js | 2 +- js/elements.min.js.map | 2 +- js/reader.js | 166 ++++++++---- js/reader.min.js | 2 +- js/reader.min.js.map | 2 +- 50 files changed, 872 insertions(+), 199 deletions(-) create mode 100644 components/content-types/news/news-horizontal-listing-gray.twig create mode 100644 components/content-types/news/news-horizontal-listing.twig create mode 100644 components/molecules/breadcrumb/breadcrumb-dropdown.twig create mode 100644 components/molecules/key-number/key-number-hn-link.twig create mode 100644 components/molecules/key-number/key-number-hn.twig create mode 100644 components/organisms/key-number-group/key-number-group-hn.twig create mode 100644 components/organisms/nav-mobile/nav-mobile.twig create mode 100644 components/organisms/nav-mobile/nav-mobile.yml create mode 100644 images/icons/icon-teaser-video.svg rename images/styleguide/news-thumbs/{news_thumb-120x58.jpg => news_thumb-120x68.jpg} (100%) create mode 100644 images/styleguide/news-thumbs/news_thumb_02-1080x608.jpg create mode 100644 images/styleguide/news-thumbs/news_thumb_02-120x68.jpg create mode 100644 images/styleguide/news-thumbs/news_thumb_02-160x90.jpg create mode 100644 images/styleguide/news-thumbs/news_thumb_02-190x107.jpg create mode 100644 images/styleguide/news-thumbs/news_thumb_02-240x135.jpg create mode 100644 images/styleguide/news-thumbs/news_thumb_02-540x304.jpg create mode 100644 images/styleguide/news-thumbs/news_thumb_02-80x45.jpg create mode 100644 images/styleguide/news-thumbs/news_thumb_02-95x53.jpg diff --git a/components/atoms/picture/picture-news-thumb.twig b/components/atoms/picture/picture-news-thumb.twig index 4bd7a500e..44f0843b7 100644 --- a/components/atoms/picture/picture-news-thumb.twig +++ b/components/atoms/picture/picture-news-thumb.twig @@ -1,3 +1,13 @@ +{% if light_image %} + + + + + + + ALT + +{% else %} @@ -6,3 +16,4 @@ ALT +{% endif %} diff --git a/components/content-types/news/news-horizontal-listing-gray.twig b/components/content-types/news/news-horizontal-listing-gray.twig new file mode 100644 index 000000000..0867a9016 --- /dev/null +++ b/components/content-types/news/news-horizontal-listing-gray.twig @@ -0,0 +1,36 @@ +
+
+ {% for i in 1..10 %} +
+ +
+ {% include '@atoms/picture/picture.twig' with {'variant':'news-thumb'} %} +
+

Physics: new e-books for the AIAA Education Series

+

+ + — Lorem ipsum dolor sit amet, consectetur adipiscing elit. Si enim ad populum me vocas, eum. Quid enim me prohiberet + Epicureum esse, si probarem, quae ille diceret? +

+
+
+ +
+ {% endfor %} +
+ +
+
+ + +
+
+
diff --git a/components/content-types/news/news-horizontal-listing.twig b/components/content-types/news/news-horizontal-listing.twig new file mode 100644 index 000000000..c02d265df --- /dev/null +++ b/components/content-types/news/news-horizontal-listing.twig @@ -0,0 +1,36 @@ +
+
+ {% for i in 1..10 %} +
+ +
+ {% include '@atoms/picture/picture.twig' with {'variant':'news-thumb'} %} +
+

Physics: new e-books for the AIAA Education Series

+

+ + — Lorem ipsum dolor sit amet, consectetur adipiscing elit. Si enim ad populum me vocas, eum. Quid enim me prohiberet + Epicureum esse, si probarem, quae ille diceret? +

+
+
+ +
+ {% endfor %} +
+ +
+
+ + +
+
+
diff --git a/components/content-types/news/news.yml b/components/content-types/news/news.yml index 90eba9016..a7a60881e 100644 --- a/components/content-types/news/news.yml +++ b/components/content-types/news/news.yml @@ -1,6 +1,13 @@ title: News name: news variants: + - name: horizontal-listing + title: Horizontal Listing + notes: Don't forget to wrap your card slider with a wrapper that will hide the overflow (`.overflow-hidden` helper class will achieve just that). + - name: horizontal-listing-gray + title: Horizontal Listing with gray background + notes: Don't forget to wrap your card slider with a wrapper that will hide the overflow (`.overflow-hidden` helper class will achieve just that). + wrapper: bg-gray-100 py-4 my-4 - name: highlighted title: Highlighted - name: highlighted-carousel diff --git a/components/molecules/breadcrumb/breadcrumb-dropdown.twig b/components/molecules/breadcrumb/breadcrumb-dropdown.twig new file mode 100644 index 000000000..fcc73ae66 --- /dev/null +++ b/components/molecules/breadcrumb/breadcrumb-dropdown.twig @@ -0,0 +1,69 @@ + diff --git a/components/molecules/breadcrumb/breadcrumb-tagged.twig b/components/molecules/breadcrumb/breadcrumb-tagged.twig index 89931be07..8483d2c62 100644 --- a/components/molecules/breadcrumb/breadcrumb-tagged.twig +++ b/components/molecules/breadcrumb/breadcrumb-tagged.twig @@ -10,9 +10,64 @@ Innovation W3C -
  • Schools
    • -
  • ENAC
    • -
  • Formations
    • -
  • Projets
    • +
  • + +
    • +
  • + Schools +
    + + +
    +
    • +
  • + School of Architecture, Civil and Environmental Engineering +
    + + +
    +
    • +
  • + ENAC Faculty +
    + + +
    +
    • diff --git a/components/molecules/breadcrumb/breadcrumb.twig b/components/molecules/breadcrumb/breadcrumb.twig index c25d16e07..33cb21eb1 100644 --- a/components/molecules/breadcrumb/breadcrumb.twig +++ b/components/molecules/breadcrumb/breadcrumb.twig @@ -1,11 +1,17 @@ diff --git a/components/molecules/breadcrumb/breadcrumb.yml b/components/molecules/breadcrumb/breadcrumb.yml index 138f5f891..81074cc0b 100644 --- a/components/molecules/breadcrumb/breadcrumb.yml +++ b/components/molecules/breadcrumb/breadcrumb.yml @@ -3,5 +3,9 @@ name: breadcrumb notes: | The breadcrumb is your compass, on every page. It helps you to understand where you are, so you can decide where to go next. variants: + - name: dropdown + title: Dropdown + notes: | + Breadcrumb dropdowns are used to display same level pages. - name: tagged title: Tagged diff --git a/components/molecules/key-number/key-number-hn-link.twig b/components/molecules/key-number/key-number-hn-link.twig new file mode 100644 index 000000000..fb78b3271 --- /dev/null +++ b/components/molecules/key-number/key-number-hn-link.twig @@ -0,0 +1,23 @@ +{% set icon = icon|default("https://via.placeholder.com/") %} + +
    +
    +
    +
    +

    près de 18'000

    +
    +
    + Pictogramme avec deux personnages +
    +
    +
    +
    +
    +
    +
    +

    étudiant·es, collaborateurs et collaboratrices font de l'EPFL une petite ville trépidante et dynamique

    +
    +
    +
    +
    +     diff --git a/components/molecules/key-number/key-number-hn.twig b/components/molecules/key-number/key-number-hn.twig new file mode 100644 index 000000000..ad8a82a14 --- /dev/null +++ b/components/molecules/key-number/key-number-hn.twig @@ -0,0 +1,23 @@ +{% set icon = icon|default("https://via.placeholder.com/") %} +
    +
    +
    +
    +
    +

    près de 18'000

    +
    +
    + Pictogramme avec deux personnages +
    +
    +
    +
    +
    +
    +
    +

    étudiant·es, collaborateurs et collaboratrices font de l'EPFL une petite ville trépidante et dynamique

    +
    +
    +
    +
    +
    diff --git a/components/molecules/key-number/key-number.yml b/components/molecules/key-number/key-number.yml index e7f6b018e..00431fb73 100644 --- a/components/molecules/key-number/key-number.yml +++ b/components/molecules/key-number/key-number.yml @@ -5,3 +5,7 @@ variants: - name: large title: Large wrapper: 'bg-gray-100' + - name: hn + title: Highlighted number + - name: hn-link + title: Highlighted number with link diff --git a/components/molecules/list-group/list-group-teasers.twig b/components/molecules/list-group/list-group-teasers.twig index e51d6db6d..25a02cdc6 100644 --- a/components/molecules/list-group/list-group-teasers.twig +++ b/components/molecules/list-group/list-group-teasers.twig @@ -1,5 +1,5 @@
    - {% for i in 1..4 %} + {% for i in 1..2 %}
    @@ -18,6 +18,40 @@
    {% endfor %} +
    +
    + + {% include '@atoms/picture/picture-news-thumb.twig' %} +
    +     +
    +
    +

    Physics: new e-books for the AIAA Education Series

    +

    + + — Lorem ipsum dolor sit amet, consectetur adipiscing elit. Si enim ad populum me vocas, eum. Quid enim me prohiberet + Epicureum esse, si probarem, quae ille diceret? +

    +
    +
    + +
    +
    + + {% include '@atoms/picture/picture-news-thumb.twig' with { light_image: true } %} +
    +     +
    +
    +

    Physics: new e-books for the AIAA Education Series

    +

    + + — Lorem ipsum dolor sit amet, consectetur adipiscing elit. Si enim ad populum me vocas, eum. Quid enim me prohiberet + Epicureum esse, si probarem, quae ille diceret? +

    +
    +
    +
    diff --git a/components/organisms/footer/footer-legal.twig b/components/organisms/footer/footer-legal.twig index c05e94950..eaaa00945 100644 --- a/components/organisms/footer/footer-legal.twig +++ b/components/organisms/footer/footer-legal.twig @@ -6,9 +6,12 @@ Accessibilité Mentions légales Protection des données + {% if isNews %} + Charte + {% endif %}
    -

    © 2023 EPFL, tous droits réservés

    +

    © 2024 EPFL, tous droits réservés

    {% endif %} @@ -18,9 +21,12 @@ Accessibility Disclaimer Privacy policy + {% if isNews %} + Charter + {% endif %}
    -

    © 2023 EPFL, all rights reserved

    +

    © 2024 EPFL, all rights reserved

    {% endif %} @@ -30,9 +36,12 @@ Zugänglichkeit Impressum Datenschutzerklärung + {% if isNews %} + Richtlinien + {% endif %}
    -

    © 2023 EPFL, alle Rechte vorbehalten

    +

    © 2024 EPFL, alle Rechte vorbehalten

    {% endif %} diff --git a/components/organisms/key-number-group/key-number-group-hn.twig b/components/organisms/key-number-group/key-number-group-hn.twig new file mode 100644 index 000000000..391445fc0 --- /dev/null +++ b/components/organisms/key-number-group/key-number-group-hn.twig @@ -0,0 +1,7 @@ +
    +
    + {% include '@molecules/key-number/key-number-hn-link.twig' %} + {% include '@molecules/key-number/key-number-hn-link.twig' %} + {% include '@molecules/key-number/key-number-hn.twig' %} +
    +
    diff --git a/components/organisms/key-number-group/key-number-group.yml b/components/organisms/key-number-group/key-number-group.yml index 81d3e874c..9fe573a45 100644 --- a/components/organisms/key-number-group/key-number-group.yml +++ b/components/organisms/key-number-group/key-number-group.yml @@ -1,3 +1,6 @@ title: Key number group name: key-number-group wrapper: bg-gray-100 +variants: + - name: hn + title: Highlighted number diff --git a/components/organisms/nav-aside/nav-aside.twig b/components/organisms/nav-aside/nav-aside.twig index b05430415..75a4b4aeb 100644 --- a/components/organisms/nav-aside/nav-aside.twig +++ b/components/organisms/nav-aside/nav-aside.twig @@ -4,10 +4,15 @@ role="navigation" aria-describedby="nav-aside-title" > -

    Dans la même section

    -