From 8b885a966e45be9e1986edad414fba53c96cb48a Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 13 Aug 2018 10:59:26 +0200 Subject: [PATCH 1/8] =?UTF-8?q?=E2=9C=A8=20add=20contact-compact=20compone?= =?UTF-8?q?nt=20and=20update=20people-list=20page=20#156?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atoms/definition-list/definition-list.scss | 6 ++---- .../organisms/contact/contact-compact.twig | 18 ++++++++++++++++++ .../components/organisms/contact/contact.yml | 2 ++ .../pages/people-list/people-list.twig | 8 +++++++- 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 assets/components/organisms/contact/contact-compact.twig diff --git a/assets/components/atoms/definition-list/definition-list.scss b/assets/components/atoms/definition-list/definition-list.scss index 744a71d72..41012de12 100644 --- a/assets/components/atoms/definition-list/definition-list.scss +++ b/assets/components/atoms/definition-list/definition-list.scss @@ -24,6 +24,7 @@ font-weight: $font-weight-base; color: $text-muted; padding-right: $grid-gutter-width / 2; + &:last-of-type { border-bottom: none; } &.definition-list-item-full { padding-bottom: 0; @@ -33,10 +34,7 @@ dd { grid-column: 2; - - &:last-child { - border-bottom: none; - } + &:last-of-type { border-bottom: none; } } dt, diff --git a/assets/components/organisms/contact/contact-compact.twig b/assets/components/organisms/contact/contact-compact.twig new file mode 100644 index 000000000..90128ad1c --- /dev/null +++ b/assets/components/organisms/contact/contact-compact.twig @@ -0,0 +1,18 @@ +
+
+
+ Heidy Traill +
+ heidy.traill@epfl.ch + +41 79 123 45 67 +
+
+

Heidy Traill

+
+
Fonction
+
Journaliste, Secouriste
+
Bureau
+
BM 4129
+
+
+
diff --git a/assets/components/organisms/contact/contact.yml b/assets/components/organisms/contact/contact.yml index 0a035c812..617463bc7 100644 --- a/assets/components/organisms/contact/contact.yml +++ b/assets/components/organisms/contact/contact.yml @@ -1,6 +1,8 @@ title: Contact name: contact variants: + - name: compact + title: Contact bloc compact - name: banner title: Banner wrapper: bg-gray-100 diff --git a/assets/components/pages/people-list/people-list.twig b/assets/components/pages/people-list/people-list.twig index 0425dcd55..672e34548 100644 --- a/assets/components/pages/people-list/people-list.twig +++ b/assets/components/pages/people-list/people-list.twig @@ -10,7 +10,13 @@
- Insérer le composant "Contact block listing" +
+ {% for i in 1..8 %} +
+ {% include '@organisms/contact/contact-compact.twig' %} +
+ {% endfor %} +
{% endblock %} From 656a30d3c3641a7a45f97a6b13db2d0a196e531b Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 13 Aug 2018 11:06:01 +0200 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=94=A7=20add=20date=20in=20both=20sub?= =?UTF-8?q?-headlines?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/config/data.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/config/data.json b/assets/config/data.json index 6eab6adf8..131f24c73 100644 --- a/assets/config/data.json +++ b/assets/config/data.json @@ -117,6 +117,7 @@ "cards": [ { "title": "La valse quantique des électrons dessine les puces de demain", + "date": "16.09.17", "info": ["Actualité", "Nanotechnologies"], "content": "Des chercheurs de l’EPFL ont réussi à mesurer certaines propriétés quantiques d’électrons de semi-conducteurs à deux dimensions. Leurs travaux dans le domaine de la spintronique pourraient notamment aboutir à la fabrication de puces plus petites et dégageant moins de chaleur." }, From 9246365816f83dee6f537b5728c63c3ae57453c5 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 13 Aug 2018 11:23:56 +0200 Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=92=84=20fix=20headlines=20fullwidth-?= =?UTF-8?q?teaser=20content=20position?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fullwidth-teaser/fullwidth-teaser.scss | 4 +++ .../organisms/headlines/headlines.twig | 36 ++++++++++--------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss b/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss index bd005e960..f86e9e5bf 100644 --- a/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss +++ b/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss @@ -210,6 +210,10 @@ padding-bottom: 3rem; } + .headlines & .fullwidth-teaser-text { + justify-content: center; + } + .fullwidth-teaser-header { justify-content: flex-end; overflow: visible; diff --git a/assets/components/organisms/headlines/headlines.twig b/assets/components/organisms/headlines/headlines.twig index 2b969b88f..b43658596 100644 --- a/assets/components/organisms/headlines/headlines.twig +++ b/assets/components/organisms/headlines/headlines.twig @@ -20,25 +20,27 @@ {% set bottomlink = bottomlink|default(true) %} -{# The intro fullwidth teaser #} -{% include '@organisms/fullwidth-teaser/fullwidth-teaser-horizontal.twig' %} +
+ {# The intro fullwidth teaser #} + {% include '@organisms/fullwidth-teaser/fullwidth-teaser-horizontal.twig' %} -{# First teasers #} -
-
-
-
- {% for card in homepage.section_one.cards %} -
- {{ macros.card_link(card) }} -
- {% endfor %} + {# First teasers #} +
+
+
+
+ {% for card in homepage.section_one.cards %} +
+ {{ macros.card_link(card) }} +
+ {% endfor %} +
+ {% if bottomlink %} +

+ {{ homepage.section_one.readmore }} +

+ {% endif %}
- {% if bottomlink %} -

- {{ homepage.section_one.readmore }} -

- {% endif %}
From a1ddb210db3b42c726ab47b85b26ff5d07a4d41a Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 13 Aug 2018 11:26:14 +0200 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=92=84revert=20headlines=20alignment?= =?UTF-8?q?=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organisms/fullwidth-teaser/fullwidth-teaser.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss b/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss index f86e9e5bf..7ae578e34 100644 --- a/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss +++ b/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss @@ -96,7 +96,7 @@ @include media-breakpoint-up(md) { padding: 1rem $grid-gutter-width 0; } - + @include media-breakpoint-up(xl) { display: flex; flex-direction: column; @@ -210,9 +210,9 @@ padding-bottom: 3rem; } - .headlines & .fullwidth-teaser-text { - justify-content: center; - } + // .headlines & .fullwidth-teaser-text { + // justify-content: center; + // } .fullwidth-teaser-header { justify-content: flex-end; From 3b024ca9cb8e3097b5ead8cabbc5160658dd3f9f Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 13 Aug 2018 11:37:19 +0200 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=92=84=20find=20a=20better=20solution?= =?UTF-8?q?=20to=20fix=20headlines=20fullwidth-teasers-horizontal=20conten?= =?UTF-8?q?t=20positioning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fullwidth-teaser/fullwidth-teaser.scss | 6 +--- .../organisms/headlines/headlines.twig | 36 +++++++++---------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss b/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss index 7ae578e34..533408df3 100644 --- a/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss +++ b/assets/components/organisms/fullwidth-teaser/fullwidth-teaser.scss @@ -207,13 +207,9 @@ left: 10%; width: 80%; justify-content: flex-end; - padding-bottom: 3rem; + padding-bottom: $spacer * 6; } - // .headlines & .fullwidth-teaser-text { - // justify-content: center; - // } - .fullwidth-teaser-header { justify-content: flex-end; overflow: visible; diff --git a/assets/components/organisms/headlines/headlines.twig b/assets/components/organisms/headlines/headlines.twig index b43658596..2b969b88f 100644 --- a/assets/components/organisms/headlines/headlines.twig +++ b/assets/components/organisms/headlines/headlines.twig @@ -20,27 +20,25 @@ {% set bottomlink = bottomlink|default(true) %} -
- {# The intro fullwidth teaser #} - {% include '@organisms/fullwidth-teaser/fullwidth-teaser-horizontal.twig' %} +{# The intro fullwidth teaser #} +{% include '@organisms/fullwidth-teaser/fullwidth-teaser-horizontal.twig' %} - {# First teasers #} -
-
-
-
- {% for card in homepage.section_one.cards %} -
- {{ macros.card_link(card) }} -
- {% endfor %} -
- {% if bottomlink %} -

- {{ homepage.section_one.readmore }} -

- {% endif %} +{# First teasers #} +
+
+
+
+ {% for card in homepage.section_one.cards %} +
+ {{ macros.card_link(card) }} +
+ {% endfor %}
+ {% if bottomlink %} +

+ {{ homepage.section_one.readmore }} +

+ {% endif %}
From 035b43ee89d581aa48308877f54b690754395959 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 13 Aug 2018 12:20:46 +0200 Subject: [PATCH 6/8] =?UTF-8?q?=E2=9C=A8=20add=20header=20dropdowns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organisms/header/header-light.twig | 12 ++++ .../components/organisms/header/header.scss | 55 +++++++++++++++---- .../pages/news-homepage/news-homepage.twig | 5 +- 3 files changed, 59 insertions(+), 13 deletions(-) diff --git a/assets/components/organisms/header/header-light.twig b/assets/components/organisms/header/header-light.twig index 2e9b13fb7..f7d49a2d8 100644 --- a/assets/components/organisms/header/header-light.twig +++ b/assets/components/organisms/header/header-light.twig @@ -7,6 +7,18 @@

{{site_title}}