From 1c749f34d17b9c781e535103b2773d04c079a3a2 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Tue, 28 Aug 2018 15:38:14 +0200 Subject: [PATCH 01/12] Add faculty on 3 columns instead of 2 #271 --- assets/components/pages/facultes/facultes.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/components/pages/facultes/facultes.twig b/assets/components/pages/facultes/facultes.twig index 3e92b6cf1..12b214c57 100644 --- a/assets/components/pages/facultes/facultes.twig +++ b/assets/components/pages/facultes/facultes.twig @@ -19,8 +19,8 @@
- {% for i in 1..8 %} -
+ {% for i in 1..10 %} +
{% include '@content-types/faculty/faculty.twig' %}
{% endfor %} From df50b7d6b3c65fc3cdc7b71b40fae4af8c06e3ac Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 10:55:28 +0200 Subject: [PATCH 02/12] Add grey background on test --- .../molecules/card-deck/card-deck-duo.twig | 18 +++++++++++++++++- .../molecules/card-deck/card-deck-single.twig | 14 +++++++++++++- .../molecules/card-deck/card-deck.twig | 18 ++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/assets/components/molecules/card-deck/card-deck-duo.twig b/assets/components/molecules/card-deck/card-deck-duo.twig index d85586865..94eaaec1b 100644 --- a/assets/components/molecules/card-deck/card-deck-duo.twig +++ b/assets/components/molecules/card-deck/card-deck-duo.twig @@ -8,4 +8,20 @@
{% include '@molecules/card/card.twig' %} {% include '@molecules/card/card.twig' %} -
\ No newline at end of file +
+
+
+
+
+
+ {% include '@molecules/card/card-link.twig' %} + {% include '@molecules/card/card-link.twig' %} +
+
+
+
+
+ {% include '@molecules/card/card.twig' %} + {% include '@molecules/card/card.twig' %} +
+
diff --git a/assets/components/molecules/card-deck/card-deck-single.twig b/assets/components/molecules/card-deck/card-deck-single.twig index e850724d1..b0478a4b7 100644 --- a/assets/components/molecules/card-deck/card-deck-single.twig +++ b/assets/components/molecules/card-deck/card-deck-single.twig @@ -6,4 +6,16 @@
{% include '@molecules/card/card.twig' %} -
\ No newline at end of file +
+ +
+
+ {% include '@molecules/card/card-link.twig' %} +
+
+
+
+
+ {% include '@molecules/card/card.twig' %} +
+
diff --git a/assets/components/molecules/card-deck/card-deck.twig b/assets/components/molecules/card-deck/card-deck.twig index 8043b0671..9ef46494e 100644 --- a/assets/components/molecules/card-deck/card-deck.twig +++ b/assets/components/molecules/card-deck/card-deck.twig @@ -11,3 +11,21 @@ {% include '@molecules/card/card.twig' %} {% include '@molecules/card/card.twig' %}
+
+
+
+
+
+ {% include '@molecules/card/card-link.twig' %} + {% include '@molecules/card/card-link.twig' %} + {% include '@molecules/card/card-link.twig' %} +
+
+
+
+
+ {% include '@molecules/card/card.twig' %} + {% include '@molecules/card/card.twig' %} + {% include '@molecules/card/card.twig' %} +
+
From 46a9b81724ea476af184fd2ffb3c47a7c8775cfe Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 11:13:24 +0200 Subject: [PATCH 03/12] Manage line only when .card-deck-line is applied, and works with gray background too --- .../molecules/card-deck/card-deck.scss | 252 ++++++++++-------- 1 file changed, 142 insertions(+), 110 deletions(-) diff --git a/assets/components/molecules/card-deck/card-deck.scss b/assets/components/molecules/card-deck/card-deck.scss index 9272d28ef..3489d56ab 100644 --- a/assets/components/molecules/card-deck/card-deck.scss +++ b/assets/components/molecules/card-deck/card-deck.scss @@ -7,30 +7,6 @@ flex-wrap: wrap; @include media-breakpoint-up(lg) { - &.card-deck-line { - - &:before { - content: ' '; - position: absolute; - top: 50%; - left: 5%; - width: 30%; - z-index: 0; - border-bottom: 1px solid $gray-100; - } - - &:after { - content: ' '; - position: absolute; - top: 50%; - right: 5%; - width: 30%; - z-index: 0; - border-bottom: 1px solid $gray-100; - } - - } - > .card { z-index: 1; margin: $spacer * 0.5; @@ -47,7 +23,7 @@ flex: 0 0 33%; margin-left: auto; } - + &:nth-last-child(n + 2) ~ * { flex: 0 0 33%; margin-right: auto; @@ -61,106 +37,162 @@ } } - /* - * for plain cards, we add pseudo elements, allowing the lines not to touch the cards - */ - > div.card { - &:first-child:last-child { - position: relative; - - &:before { - content: ' '; - display: block; - position: absolute; - top: 0; - left: calc(#{$spacer * -1} - 1px); - width: $spacer; - height: 100%; - background: white; - } + &.card-deck-line { - &:after { - content: ' '; - display: block; - position: absolute; - top: 0; - right: calc(#{$spacer * -1} - 1px); - width: $spacer; - height: 100%; - background: white; - } + &:before { + content: ' '; + position: absolute; + top: 50%; + left: 5%; + width: 30%; + z-index: 0; + border-bottom: 1px solid $gray-100; + .bg-gray-100 & { + border-bottom-color: $gray-300; + } } - // two cards are present - &:nth-last-child(n + 2) { - &:before { - content: ' '; - display: block; - position: absolute; - top: 0; - left: calc(#{$spacer * -1} - 1px); - width: $spacer; - height: 100%; - background: white; + &:after { + content: ' '; + position: absolute; + top: 50%; + right: 5%; + width: 30%; + z-index: 0; + border-bottom: 1px solid $gray-100; + + .bg-gray-100 & { + border-bottom-color: $gray-300; } } - - &:nth-last-child(n + 2) ~ * { - &:after { - content: ' '; - display: block; - position: absolute; - top: 0; - right: calc(#{$spacer * -1} - 1px); - width: $spacer; - height: 100%; - background: white; + + /* + * for plain cards, we add pseudo elements, allowing the lines not to touch the cards + */ + > div.card { + &:first-child:last-child { + position: relative; + + &:before { + content: ' '; + display: block; + position: absolute; + top: 0; + left: calc(#{$spacer * -1} - 1px); + width: $spacer; + height: 100%; + background: white; + + .bg-gray-100 & { + background-color: $gray-100; + } + } + + &:after { + content: ' '; + display: block; + position: absolute; + top: 0; + right: calc(#{$spacer * -1} - 1px); + width: $spacer; + height: 100%; + background: white; + + .bg-gray-100 & { + background-color: $gray-100; + } + } } - } - // three or more cards are present - &:nth-last-child(n + 3), - &:nth-last-child(n + 3) ~ * { - - &:before, - &:after { - content: none; + // two cards are present + &:nth-last-child(n + 2) { + &:before { + content: ' '; + display: block; + position: absolute; + top: 0; + left: calc(#{$spacer * -1} - 1px); + width: $spacer; + height: 100%; + background: white; + + .bg-gray-100 & { + background-color: $gray-100; + } + } } - } - } + &:nth-last-child(n + 2) ~ * { + &:after { + content: ' '; + display: block; + position: absolute; + top: 0; + right: calc(#{$spacer * -1} - 1px); + width: $spacer; + height: 100%; + background: white; + + .bg-gray-100 & { + background-color: $gray-100; + } + } + } - /* - * Styles for card-links. this is tricky because we already use before and after pseudo elements - * on card-links. So to avoid the line touching the card, we add a border - */ - > a.card { + // three or more cards are present + &:nth-last-child(n + 3), + &:nth-last-child(n + 3) ~ * { - // only one card is present - &:first-child:last-child { - flex: 0 0 calc(33% + #{$spacer * 1.5}); - border-left: 1rem solid white; - border-right: 1rem solid white; - } + &:before, + &:after { + content: none; + } - // two cards are present - &:nth-last-child(n + 2) { - flex: 0 0 calc(33% + #{$spacer * 1.5}); - border-left: 1rem solid white; - } - - &:nth-last-child(n + 2) ~ * { - flex: 0 0 calc(33% + $spacer); - border-right: 1rem solid white; + } } - // three or more cards are present - &:nth-last-child(n + 3), - &:nth-last-child(n + 3) ~ * { - flex: 1 1 30%; - border: none; + /* + * Styles for card-links. this is tricky because we already use before and after pseudo elements + * on card-links. So to avoid the line touching the card, we add a border + */ + > a.card { + + // only one card is present + &:first-child:last-child { + flex: 0 0 calc(33% + #{$spacer * 1.5}); + border-left: 1rem solid white; + border-right: 1rem solid white; + .bg-gray-100 & { + border-right-color: $gray-100; + border-left-color: $gray-100; + } + } + + // two cards are present + &:nth-last-child(n + 2) { + flex: 0 0 calc(33% + #{$spacer * 1.5}); + border-left: 1rem solid white; + .bg-gray-100 & { + border-left-color: $gray-100; + } + } + + &:nth-last-child(n + 2) ~ * { + flex: 0 0 calc(33% + $spacer); + border-right: 1rem solid white; + .bg-gray-100 & { + border-right-color: $gray-100; + } + } + + // three or more cards are present + &:nth-last-child(n + 3), + &:nth-last-child(n + 3) ~ * { + flex: 1 1 30%; + border: none; + } } } } -} \ No newline at end of file +} From 7e0f53dd1929f13037b1f96be0cb0dcb56b6d675 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 13:06:20 +0200 Subject: [PATCH 04/12] fix event content type usage of card slider with overflow-hidden utility class fix #273 --- assets/components/content-types/event/event.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/components/content-types/event/event.yml b/assets/components/content-types/event/event.yml index 27685400c..75d1060d1 100644 --- a/assets/components/content-types/event/event.yml +++ b/assets/components/content-types/event/event.yml @@ -17,7 +17,7 @@ variants: title: Just finished - name: wrapper title: Slider wrapper - wrapper: bg-gray-100 + wrapper: bg-gray-100 overflow-hidden notes: | ### Basic teaser From 683abc88be11160b8a53ff36be8230343c66b861 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 14:23:10 +0200 Subject: [PATCH 05/12] After review, one twig file for each variant --- .../card-deck/card-deck-duo-gray.twig | 4 +++ .../molecules/card-deck/card-deck-duo.twig | 23 ---------------- .../card-deck/card-deck-link-duo-gray.twig | 4 +++ .../card-deck/card-deck-link-duo.twig | 4 +++ .../card-deck/card-deck-link-single-gray.twig | 3 +++ .../card-deck/card-deck-link-single.twig | 3 +++ .../card-deck/card-deck-single-gray.twig | 3 +++ .../molecules/card-deck/card-deck-single.twig | 18 ------------- .../molecules/card-deck/card-deck.twig | 26 ------------------- .../molecules/card-deck/card-deck.yml | 18 ++++++++++++- 10 files changed, 38 insertions(+), 68 deletions(-) create mode 100644 assets/components/molecules/card-deck/card-deck-duo-gray.twig create mode 100644 assets/components/molecules/card-deck/card-deck-link-duo-gray.twig create mode 100644 assets/components/molecules/card-deck/card-deck-link-duo.twig create mode 100644 assets/components/molecules/card-deck/card-deck-link-single-gray.twig create mode 100644 assets/components/molecules/card-deck/card-deck-link-single.twig create mode 100644 assets/components/molecules/card-deck/card-deck-single-gray.twig diff --git a/assets/components/molecules/card-deck/card-deck-duo-gray.twig b/assets/components/molecules/card-deck/card-deck-duo-gray.twig new file mode 100644 index 000000000..32a967b40 --- /dev/null +++ b/assets/components/molecules/card-deck/card-deck-duo-gray.twig @@ -0,0 +1,4 @@ +
+ {% include '@molecules/card/card.twig' %} + {% include '@molecules/card/card.twig' %} +
diff --git a/assets/components/molecules/card-deck/card-deck-duo.twig b/assets/components/molecules/card-deck/card-deck-duo.twig index 94eaaec1b..32a967b40 100644 --- a/assets/components/molecules/card-deck/card-deck-duo.twig +++ b/assets/components/molecules/card-deck/card-deck-duo.twig @@ -1,27 +1,4 @@ -
- {% include '@molecules/card/card-link.twig' %} - {% include '@molecules/card/card-link.twig' %} -
-
-
-
{% include '@molecules/card/card.twig' %} {% include '@molecules/card/card.twig' %}
-
-
-
-
-
- {% include '@molecules/card/card-link.twig' %} - {% include '@molecules/card/card-link.twig' %} -
-
-
-
-
- {% include '@molecules/card/card.twig' %} - {% include '@molecules/card/card.twig' %} -
-
diff --git a/assets/components/molecules/card-deck/card-deck-link-duo-gray.twig b/assets/components/molecules/card-deck/card-deck-link-duo-gray.twig new file mode 100644 index 000000000..0d1b68602 --- /dev/null +++ b/assets/components/molecules/card-deck/card-deck-link-duo-gray.twig @@ -0,0 +1,4 @@ +
+ {% include '@molecules/card/card-link.twig' %} + {% include '@molecules/card/card-link.twig' %} +
diff --git a/assets/components/molecules/card-deck/card-deck-link-duo.twig b/assets/components/molecules/card-deck/card-deck-link-duo.twig new file mode 100644 index 000000000..0d1b68602 --- /dev/null +++ b/assets/components/molecules/card-deck/card-deck-link-duo.twig @@ -0,0 +1,4 @@ +
+ {% include '@molecules/card/card-link.twig' %} + {% include '@molecules/card/card-link.twig' %} +
diff --git a/assets/components/molecules/card-deck/card-deck-link-single-gray.twig b/assets/components/molecules/card-deck/card-deck-link-single-gray.twig new file mode 100644 index 000000000..f84c79e37 --- /dev/null +++ b/assets/components/molecules/card-deck/card-deck-link-single-gray.twig @@ -0,0 +1,3 @@ +
+ {% include '@molecules/card/card-link.twig' %} +
diff --git a/assets/components/molecules/card-deck/card-deck-link-single.twig b/assets/components/molecules/card-deck/card-deck-link-single.twig new file mode 100644 index 000000000..f84c79e37 --- /dev/null +++ b/assets/components/molecules/card-deck/card-deck-link-single.twig @@ -0,0 +1,3 @@ +
+ {% include '@molecules/card/card-link.twig' %} +
diff --git a/assets/components/molecules/card-deck/card-deck-single-gray.twig b/assets/components/molecules/card-deck/card-deck-single-gray.twig new file mode 100644 index 000000000..f84c79e37 --- /dev/null +++ b/assets/components/molecules/card-deck/card-deck-single-gray.twig @@ -0,0 +1,3 @@ +
+ {% include '@molecules/card/card-link.twig' %} +
diff --git a/assets/components/molecules/card-deck/card-deck-single.twig b/assets/components/molecules/card-deck/card-deck-single.twig index b0478a4b7..a790b786e 100644 --- a/assets/components/molecules/card-deck/card-deck-single.twig +++ b/assets/components/molecules/card-deck/card-deck-single.twig @@ -1,21 +1,3 @@ -
- {% include '@molecules/card/card-link.twig' %} -
-
-
-
{% include '@molecules/card/card.twig' %}
- -
-
- {% include '@molecules/card/card-link.twig' %} -
-
-
-
-
- {% include '@molecules/card/card.twig' %} -
-
diff --git a/assets/components/molecules/card-deck/card-deck.twig b/assets/components/molecules/card-deck/card-deck.twig index 9ef46494e..70efaa8db 100644 --- a/assets/components/molecules/card-deck/card-deck.twig +++ b/assets/components/molecules/card-deck/card-deck.twig @@ -3,29 +3,3 @@ {% include '@molecules/card/card-link.twig' %} {% include '@molecules/card/card-link.twig' %} -
-
-
-
- {% include '@molecules/card/card.twig' %} - {% include '@molecules/card/card.twig' %} - {% include '@molecules/card/card.twig' %} -
-
-
-
-
-
- {% include '@molecules/card/card-link.twig' %} - {% include '@molecules/card/card-link.twig' %} - {% include '@molecules/card/card-link.twig' %} -
-
-
-
-
- {% include '@molecules/card/card.twig' %} - {% include '@molecules/card/card.twig' %} - {% include '@molecules/card/card.twig' %} -
-
diff --git a/assets/components/molecules/card-deck/card-deck.yml b/assets/components/molecules/card-deck/card-deck.yml index 0a22bae76..9101616fd 100644 --- a/assets/components/molecules/card-deck/card-deck.yml +++ b/assets/components/molecules/card-deck/card-deck.yml @@ -3,10 +3,26 @@ name: card-deck variants: - name: duo title: Duo + - name: duo-gray + title: Duo with gray background + wrapper: bg-gray-100 py-4 my-4 - name: single title: Single + - name: single-gray + title: Single with gray background + wrapper: bg-gray-100 py-4 my-4 + - name: link-duo + title: Link Duo + - name: link-duo-gray + title: Link Duo with gray background + wrapper: bg-gray-100 py-4 my-4 + - name: link-single + title: Link Single + - name: link-single-gray + title: Link Single with gray background + wrapper: bg-gray-100 py-4 my-4 notes: | This component allows you to display multiple cards side by side, in a set of equal width and height. You just have to wrap cards inside of a `.card-deck` component.

- Add the `.card-deck-line` class to the container, when you want to display 1 ou 2 cards only, to add a visual touch on desktop helping readability \ No newline at end of file + Add the `.card-deck-line` class to the container, when you want to display 1 ou 2 cards only, to add a visual touch on desktop helping readability From c7fbb86b9c35b27b9c46b0541a96d6f52d518019 Mon Sep 17 00:00:00 2001 From: knuch Date: Wed, 29 Aug 2018 14:52:28 +0200 Subject: [PATCH 06/12] document card deck with gray backgrounds --- assets/components/molecules/card-deck/card-deck.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/components/molecules/card-deck/card-deck.yml b/assets/components/molecules/card-deck/card-deck.yml index 9101616fd..5c8cf07a9 100644 --- a/assets/components/molecules/card-deck/card-deck.yml +++ b/assets/components/molecules/card-deck/card-deck.yml @@ -5,22 +5,26 @@ variants: title: Duo - name: duo-gray title: Duo with gray background + notes: When wrapped into a container with the class `.bg-gray-100`, the card deck lines will appear darker and cards will get a correct background color / border color to avoid lines touching them. wrapper: bg-gray-100 py-4 my-4 - name: single title: Single - name: single-gray title: Single with gray background wrapper: bg-gray-100 py-4 my-4 + notes: When wrapped into a container with the class `.bg-gray-100`, the card deck lines will appear darker and cards will get a correct background color / border color to avoid lines touching them. - name: link-duo title: Link Duo - name: link-duo-gray title: Link Duo with gray background wrapper: bg-gray-100 py-4 my-4 + notes: When wrapped into a container with the class `.bg-gray-100`, the card deck lines will appear darker and cards will get a correct background color / border color to avoid lines touching them. - name: link-single title: Link Single - name: link-single-gray title: Link Single with gray background wrapper: bg-gray-100 py-4 my-4 + notes: When wrapped into a container with the class `.bg-gray-100`, the card deck lines will appear darker and cards will get a correct background color / border color to avoid lines touching them. notes: | This component allows you to display multiple cards side by side, in a set of equal width and height. You just have to wrap cards inside of a `.card-deck` component.
From dac8ff883bba92fb8358017efb81d67754de0e01 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Wed, 29 Aug 2018 15:27:43 +0200 Subject: [PATCH 07/12] =?UTF-8?q?=F0=9F=90=9B=20prevent=20white=20margin?= =?UTF-8?q?=20between=20gray=20containers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/components/pages/homepage/homepage.twig | 2 +- assets/config/layout.scss | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/components/pages/homepage/homepage.twig b/assets/components/pages/homepage/homepage.twig index 73656ecc2..791aebc08 100644 --- a/assets/components/pages/homepage/homepage.twig +++ b/assets/components/pages/homepage/homepage.twig @@ -85,7 +85,7 @@ {# The Calendar section #} {# TODO add card-slider from Yann PR #} -
+
{% include '@molecules/datepicker/datepicker-fancy.twig' %}
diff --git a/assets/config/layout.scss b/assets/config/layout.scss index fe51d3613..faa412755 100644 --- a/assets/config/layout.scss +++ b/assets/config/layout.scss @@ -59,7 +59,7 @@ grid-column: content; } - .container-full, + .container-full, .container, .embed-responsive, & > iframe { @@ -67,6 +67,8 @@ } } +.container-full[class*="bg-"] + .container-full[class*="bg-"] { margin-top: 0 !important; } + @include ie11('.container-grid') { display: block; } From 2aef6a1bfb7a0124a8e330a1f050c98fc2e07cfc Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 16:23:21 +0200 Subject: [PATCH 08/12] fix #175 added key numbers --- assets/components/pages/innovation/innovation.twig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/components/pages/innovation/innovation.twig b/assets/components/pages/innovation/innovation.twig index 05b139bfe..47f326ad7 100644 --- a/assets/components/pages/innovation/innovation.twig +++ b/assets/components/pages/innovation/innovation.twig @@ -19,11 +19,13 @@

-
-

Composant "chiffre clés"

+
+
+

Key numbers

+
+ {% include '@organisms/key-number-group/key-number-group.twig' %}
-
{% include '@content-types/news/news-latest-two.twig' %}
From 25b5d8489eb7f78b867460fc9641c2574a0775f6 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 16:24:42 +0200 Subject: [PATCH 09/12] fix #172 added key numbers --- assets/components/pages/education/education.twig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/components/pages/education/education.twig b/assets/components/pages/education/education.twig index 51c1e652d..7dcc7421d 100644 --- a/assets/components/pages/education/education.twig +++ b/assets/components/pages/education/education.twig @@ -19,8 +19,11 @@

-
-

Composant "chiffre clés"

+
+
+

Key numbers

+
+ {% include '@organisms/key-number-group/key-number-group.twig' %}
From 2f3eb1a32711c6dca743520f7e7f5193b8c6363c Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 16:28:21 +0200 Subject: [PATCH 10/12] fix #176 add keynumbers --- assets/components/pages/campus/campus.twig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/components/pages/campus/campus.twig b/assets/components/pages/campus/campus.twig index 59839fc1b..2903f1eb3 100644 --- a/assets/components/pages/campus/campus.twig +++ b/assets/components/pages/campus/campus.twig @@ -55,8 +55,11 @@
-
-

Composant "chiffre clés"

+
+
+

Key numbers

+
+ {% include '@organisms/key-number-group/key-number-group.twig' %}
From d5f5d9021cdcf33be1456c1dffd593f5567a2d8d Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Wed, 29 Aug 2018 16:31:49 +0200 Subject: [PATCH 11/12] fix #174 add key numbers --- .../components/pages/research/research.twig | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/assets/components/pages/research/research.twig b/assets/components/pages/research/research.twig index 0c01f5534..8e63058c9 100644 --- a/assets/components/pages/research/research.twig +++ b/assets/components/pages/research/research.twig @@ -11,13 +11,22 @@
-
+

- Insérer le composant "Key numbers" + L'EPFL s'engage dans des projets novateurs alliant recherche fondamentale et recherche appliquée. Cette orientation permet de transformer l'excellence scientifique en compétitivité économique, en emplois et en qualité de vie, grâce au transfert des technologies.

+

L'Ecole dispose d'une organisation unique pour stimuler les recherches transdisciplinaires et favoriser les partenariats avec d'autres institutions.

+

Avec plus de 300 laboratoires et groupes de recherche sur son campus, l'EPFL figure parmi les institutions les plus innovantes et les plus productives sur le plan scientifique.

+
+
+

Key numbers

+
+ {% include '@organisms/key-number-group/key-number-group.twig' %} +
+

The last news

@@ -34,17 +43,7 @@
-
-
-

- L'EPFL s'engage dans des projets novateurs alliant recherche fondamentale et recherche appliquée. Cette orientation permet de transformer l'excellence scientifique en compétitivité économique, en emplois et en qualité de vie, grâce au transfert des technologies.

-

L'Ecole dispose d'une organisation unique pour stimuler les recherches transdisciplinaires et favoriser les partenariats avec d'autres institutions.

-

Avec plus de 300 laboratoires et groupes de recherche sur son campus, l'EPFL figure parmi les institutions les plus innovantes et les plus productives sur le plan scientifique.

-

-
-
- -
+

Explore

@@ -69,7 +68,6 @@
-
From 3d987858ec0b138cb28bb9c1f0ffb1bc1e037187 Mon Sep 17 00:00:00 2001 From: knuch Date: Wed, 29 Aug 2018 17:45:27 +0200 Subject: [PATCH 12/12] bump version --- CHANGELOG.md | 14 ++++++++++++++ VERSION | 2 +- package.json | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 131a675df..bfe507a96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ # CHANGELOG +*1.2.1* (2018-08-29 +- ⚠️ breaking markup changes + - none + + - ✨ New implementations + - d3304126e8429eb7f907c58c767c390177b5017a card-deck looks beeter when on grey background + - card deck variants + + - 🛠 Fixes & other + - 5e5daf8fb350f96b90f1af6adfb6c9ffb39b6275 faculties page: 3 columns instead of 2 + - prevent margin between two followed gray containers + - added key numbers on example pages + + *1.2.0* (2018-08-27) - ⚠️ breaking markup changes - **Organisms** : diff --git a/VERSION b/VERSION index 26aaba0e8..6085e9465 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.0 +1.2.1 diff --git a/package.json b/package.json index e7a9c67cc..fcbfde6b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "epfl-elements", - "version": "1.2.0", + "version": "1.2.1", "license": "MIT", "main": "index.html", "repository": {