From bc4795d9a5f6273c26ef570a6240ab2e9be75e8e Mon Sep 17 00:00:00 2001 From: Toni Fisler Date: Tue, 24 Jul 2018 14:31:56 +0200 Subject: [PATCH 01/46] setup study plan --- assets/components/base.scss | 1 + .../components/study-plan/study-plan-ie.scss | 42 + .../components/study-plan/study-plan.scss | 274 ++++ .../components/study-plan/study-plan.twig | 1324 ++++++++++++++++- assets/config/bootstrap-variables.scss | 2 +- assets/config/mixins.scss | 2 + 6 files changed, 1643 insertions(+), 2 deletions(-) create mode 100644 assets/components/components/study-plan/study-plan-ie.scss diff --git a/assets/components/base.scss b/assets/components/base.scss index a60d1c048..4e0d8f379 100644 --- a/assets/components/base.scss +++ b/assets/components/base.scss @@ -83,6 +83,7 @@ @import 'components/pagination/pagination'; @import 'components/teaser-press-review/teaser-press-review'; @import 'components/study-plan/study-plan'; +@import 'components/study-plan/study-plan-ie'; @import 'components/coursebook/coursebook'; @import 'components/text/text'; @import 'components/newsletter-sign-up/newsletter-sign-up'; diff --git a/assets/components/components/study-plan/study-plan-ie.scss b/assets/components/components/study-plan/study-plan-ie.scss new file mode 100644 index 000000000..06404a0c3 --- /dev/null +++ b/assets/components/components/study-plan/study-plan-ie.scss @@ -0,0 +1,42 @@ +@charset "utf-8"; + +/* stylelint-disable */ +// This file is intended for IE 11 and has autoprefixer and stylelint off. + +// IE 11 table headings +@include ie11('.table-like .cours-title') {-ms-grid-column: 2;} +@include ie11('.table-like .section') {-ms-grid-column: 3;} +@include ie11('.table-like .enseignement') {-ms-grid-column: 4;} +@include ie11('.table-like .bachlor') {-ms-grid-column: 5;} +@include ie11('.table-like .bachlor + .bachlor') {-ms-grid-column: 6;} +@include ie11('.table-like .bachlor + .bachlor + .bachlor') {-ms-grid-column: 7;} +@include ie11('.table-like .examen') {-ms-grid-column: 8;} +@include ie11('.table-like .credit') {-ms-grid-column: 9;} + +// IE 11 table contents +@include ie11('.table-like .line .cours') { + -ms-grid-column: 2; + -ms-grid-column-span: 3; +} +@include ie11('.table-like .line .bachlor') {-ms-grid-column: 5;} +@include ie11('.table-like .line .bachlor + .bachlor') {-ms-grid-column: 6;} +@include ie11('.table-like .line .bachlor + .bachlor + .bachlor') {-ms-grid-column: 7;} +@include ie11('.table-like .line .examen') {-ms-grid-column: 8;} +@include ie11('.table-like .line .credit') {-ms-grid-column: 9;} + +// IE 11 cours grid +@include ie11('.table-like .cours .section-name') { + -ms-grid-column: 2; + -ms-grid-row-span: 2; +} +@include ie11('.table-like .cours .enseignement-name') { + -ms-grid-column: 3; + -ms-grid-row-span: 2; +} +@include ie11('.table-like .cours .cours-code') {-ms-grid-row: 2;} + +// IE 11 Bachlor section +@include ie11(' .cep + .cep') {-ms-grid-column: 2;} +@include ie11('.table-like .cep + .cep + .cep') {-ms-grid-column: 3;} +@include ie11('.table-like .cep + .cep') {-ms-grid-column: 2;} +@include ie11('.table-like .bachlor-text') {-ms-grid-rows: 100%;} diff --git a/assets/components/components/study-plan/study-plan.scss b/assets/components/components/study-plan/study-plan.scss index 7c81b0e79..ec5e9f67a 100644 --- a/assets/components/components/study-plan/study-plan.scss +++ b/assets/components/components/study-plan/study-plan.scss @@ -1 +1,275 @@ @charset 'utf-8'; + + + +.table-like { + $table-grid-template-columns: 1fr 3fr 1fr 3fr 2fr 2fr 2fr 3fr 1fr; + --table-columns: #{$table-grid-template-columns}; + + h4 { + font-weight: $font-weight-bold; + font-size: $font-size-base; + } + + // Lines + // Grid properties are overridden on browsers supporting "display: contents". + .line, + .first-line { + display: grid; + grid-template-columns: $table-grid-template-columns; + font-size: 0.9375 * $font-size-base; + + // Cells + > div { + padding: $table-cell-padding; + border-bottom: $table-border-width solid $table-border-color; + + &:first-child { + border-left: $table-border-width solid $table-border-color; + } + + &:last-child { + border-right: $table-border-width solid $table-border-color; + } + + + div { + border-left: $table-border-width solid $table-border-color; + } + } + } + + .first-line { + color: $table-head-color; + font-weight: $font-weight-bold; + text-transform: uppercase; + font-size: 0.6875 * $font-size-base; + + > div { + border-top: $table-border-width solid $table-border-color; + border-bottom-width: $table-border-width * 2; + } + } + + .line-up { + position: sticky; + top: 0; + background-color: $table-head-bg; + } + + // LOURD + @supports (display: contents) { + display: grid; + grid-template-columns: var(--table-columns); + background-color: $table-border-color; + + .line-up, + .line-down, + .line, + .first-line { + display: contents; + + > div { + background-color: $body-bg; + } + } + + .first-line { + > div { + background-color: $table-head-bg; + } + } + + h4 { + grid-column: 1 / -1; + background-color: $body-bg; + margin-bottom: 0; + padding-bottom: $headings-margin-bottom; + } + + .first-line + .clear, + .line + .clear { + display: block; + grid-column: 1 / -1; + height: 0; + } + } + // 👊✋🎤🎶 + + // Bachelor headings and content + .titre_bachlor { + text-align: center; + } + + .bachlor .titre, + .bachlor-text { + display: grid; + grid-column-gap: 2px; + grid-template-columns: repeat(3, 1fr); + + .cep { + + text-align: center; + } + } + + .bachlor .titre { + margin-right: -$table-cell-padding; + margin-left: -$table-cell-padding; + } + + .line-down .bachlor { + padding: 0 !important; + } + + // Stripes + .bachlor-text { + height: 100%; + background: repeating-linear-gradient(0deg, $body-bg, $body-bg 2px, $table-border-color 2px, $table-border-color 4px); + + .cep { + padding-top: $table-cell-padding; + padding-bottom: $table-cell-padding; + background-color: $body-bg; + + &:nth-child(2) { + background-color: $table-head-bg; + } + } + } + + .line-down .bachlor:nth-child(4) { + .cep { + background-color: $table-head-bg; + + &:nth-child(2) { + background-color: $body-bg; + } + } + } + + // Cours is actually 3 divs for the price of one! + .cours { + display: grid; + grid-template-columns: 3fr 1fr 3fr; + grid-auto-rows: auto; + grid-column: span 3; + grid-column-gap: $table-border-width; + padding: 0 !important; // Have to do this, the > and + are so specific + background-color: $table-border-color !important; // Will override the normal background color for grid gap color + + > div { + padding: $table-cell-padding; + background-color: $body-bg; + } + + .cours-code { + grid-area: 2 / 1; + } + + .section-name, + .enseignement-name { + grid-row: span 2; + } + } + + .cours-name { + padding-bottom: 0 !important; + } + + .cours-code { + padding-top: 0 !important; + } + + .cours-title { + .bold { + color: $body-color; + } + } + + // Exam + .examen { + display: flex; + } + + // Credit + .credit-time { + font-size: $font-size-lg; + text-align: right; + color: $text-muted; + } + + // Languages + .first-line .langue { + &:before { + content: 'Langue'; + } + } + + .langue { + &.francais { + &:before { + content: 'FR'; + } + } + + &.anglais { + &:before { + content: 'EN'; + } + } + + .diet_icon { + display: none; + } + } + + // Icons + .exam-icon { + .sun { + &:before { + content: '☀️'; + } + } + + .winter { + &:before { + content: '❄️'; + } + } + } + + // Hover on line + .line { + &:hover { + > div, + .cours > div, + .cep { + background-color: $table-head-bg; + } + + .cep:nth-child(2), + .bachlor:nth-child(4) .cep { + background-color: darken($table-head-bg, 4%); + } + + .bachlor:nth-child(4) .cep:nth-child(2) { + background-color: $table-head-bg; + } + } + } + + // Maybe we'll have to handle those colors in some way. + //.bachlor { + // &.local-color { + // background-color: $table-border-color; + // } + // + // &.local-color-light { + // background-color: gray('100'); + // } + //} + + .clear { + display: none; + } +} diff --git a/assets/components/components/study-plan/study-plan.twig b/assets/components/components/study-plan/study-plan.twig index f20e67f0e..7c65d7ab8 100644 --- a/assets/components/components/study-plan/study-plan.twig +++ b/assets/components/components/study-plan/study-plan.twig @@ -1 +1,1323 @@ -🤷‍♀️ +
+

Bloc 2 (Propédeutique)

+
+
+
+
+
Cours
+
Code
+
+
+
 
+
Sections
+
+
+
 
+
Enseignants
+
+
+
Bachelor 1 
+
+
c
+
e
+
p
+
+
+
+
Bachelor 2 
+
+
c
+
e
+
p
+
+
+
+
Mise à niveau 
+
+
c
+
e
+
p
+
+
+
+
Examen
+
 
+
+
+
Coefficient
+
 
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
+ Analyse territoriale et urbaine +
+
AR-153 
+
AR 
+
+ Barcelloni Corte
+ Cavalieri
+ Viganò +   +
+
+
+
+
 
+
 
+
 
+
+
+
+
+
1h 
+
2h 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
+ Pendant le semestre +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Figuration graphique
+
AR-113 
+
AR 
+
Braghieri
Soubeyrand +   +
+
+
+
+
 
+
 
+
 
+
+
+
+
+
1h 
+
3h 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
+ Pendant le semestre +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Histoire de l'architecture I
+
AR-123 
+
AR 
+
Adam +   +
+
+
+
+
2h 
+
 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
+ Ecrit +
+
+
2
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Histoire de l'architecture II
+
AR-124 
+
AR 
+
Gargiani +   +
+
+
+
+
 
+
 
+
 
+
+
+
+
+
2h 
+
 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
+ Ecrit +
+
+
2
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Théorie de l'architecture I
+
AR-121 
+
AR 
+
Marchand +   +
+
+
+
+
2h 
+
 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Théorie de l'architecture II
+
AR-122 
+
AR 
+
Marchand +   +
+
+
+
+
 
+
 
+
 
+
+
+
+
+
2h 
+
 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Théorie et critique du projet BA1
+
AR-101 
+
AR 
+
Dietz +   +
+
+
+
+
2h 
+
 
+
4h 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Théorie et critique du projet BA2
+
AR-102 
+
AR 
+
Dietz +   +
+
+
+
+
 
+
 
+
 
+
+
+
+
+
2h 
+
 
+
4h 
+
+
+
+
+
 
+
 
+
 
+
+
+
+
+
 
+
+ Pendant le semestre +
+
+
14
+
+
+
 
+
+
+ +
+

Mineur : Informatique

+
+
+
+
+
Cours
+
Code
+
+
+
 
+
Sections
+
+
+
 
+
Enseignants
+
+
+
Examen
+
 
+
+
+
Crédits
+
 
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Advanced + algorithms
+
CS-450 
+
IN 
+
Svensson +   +
+
+
+
+
 
+
+ Ecrit +
+
+
7
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Advanced + computer architecture
+
CS-470 
+
IN 
+
Ienne +   +
+
+
+
+
 
+
+ Oral +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Advanced computer + graphics
+
CS-440 
+
IN 
+
Jakob +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
6
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Algorithms
+
CS-250 
+
IN 
+
Kapralov +   +
+
+
+
+
 
+
+ Ecrit +
+
+
6
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Architecture + des systems-on-chip
+
CS-209 
+
IN 
+
Ienne +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Computer + architecture
+
CS-208 
+
IN 
+
Stojilovic +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Computer + networks
+
COM-208 
+
SC 
+
Argyraki +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
5
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Computer + vision
+
CS-442 
+
IN 
+
Fua +   +
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Cryptography and + security
+
COM-401 
+
SC 
+
Vaudenay +   +
+
+
+
+
 
+
+ Ecrit +
+
+
7
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Database + systems
+
CS-422 
+
IN 
+
Ailamaki
Karpathiotakis
Papapetrou +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
7
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Distributed + algorithms
+
CS-451 
+
SC 
+
Guerraoui +   +
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Distributed + information systems
+
CS-423 
+
SC 
+
Aberer +   +
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Foundations + of software
+
CS-452 
+
IN 
+
Odersky +   +
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Information + theory and coding
+
COM-404 
+
SC 
+
Telatar +   +
+
+
+
+
 
+
+ Ecrit +
+
+
7
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Informatique du + temps réel
+
CS-321 
+
SC 
+
Decotignie +   +
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Intelligence + artificielle
+
CS-330 
+
IN 
+
Faltings +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Intelligent + agents
+
CS-430 
+
IN 
+
Faltings +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
6
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Introduction + to computer graphics
+
CS-341 
+
IN 
+
Pauly +   +
+
+
+
+
 
+
+ Ecrit +
+
+
6
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Introduction + to database systems
+
CS-322 
+
IN 
+
Ailamaki
Koch +   +
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Introduction + to operating systems
+
CS-323 
+
IN 
+
Zwaenepoel +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
3
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Machine + learning
+
CS-433 
+
IN 
+
Jaggi
Urbanke +   +
+
+
+
+
 
+
+ Ecrit +
+
+
7
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Optional + project in computer science
+
CS-596 
+
IN 
+
Profs divers +   +
+
+
+
+
 
+
 
+
+ Pendant le semestre +
+
+
8
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Programmation + orientée système
+
CS-207 
+
IN 
+
Chappelier +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
3
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Projet + programmation système
+
CS-207(a) 
+
IN 
+
Chappelier
Figueiredo Mascarenhas + Moreira Pedrosa +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
2
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Sécurité + des réseaux
+
COM-301 
+
SC 
+
Oechslin +   +
+
+
+
+
 
+
+ Ecrit +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Software + engineering
+
CS-305 
+
IN 
+
Candea +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
6
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Theory + of computation
+
CS-251 
+
IN 
+
Vishnoi +   +
+
+
+
+
 
+
+ Pendant le semestre +
+
+
4
+
+
+
 
+
+
+
+
+
+
 
  +
+   +
+
+
Topics + in theoretical computer science (pas donné en 2017-18)
+
CS-455 
+
IN 
+
+   +
+
+
+
+
 
+
 
+
+ Pendant le semestre +
+
+
4
+
+
+
 
+
+
diff --git a/assets/config/bootstrap-variables.scss b/assets/config/bootstrap-variables.scss index 73a22af99..4bada6b8b 100644 --- a/assets/config/bootstrap-variables.scss +++ b/assets/config/bootstrap-variables.scss @@ -290,7 +290,7 @@ $table-border-width: $border-width !default; $table-border-color: $gray-200 !default; $table-border-color-light: $gray-100; -$table-head-bg: $gray-200 !default; +$table-head-bg: lighten($gray-100, 5.49) !default; $table-head-color: $gray-600 !default; $table-dark-bg: $black !default; diff --git a/assets/config/mixins.scss b/assets/config/mixins.scss index 35d453388..bf908f59f 100644 --- a/assets/config/mixins.scss +++ b/assets/config/mixins.scss @@ -208,8 +208,10 @@ // IE 11 mixin +// WARNING: Autoprefixer is off inside this. @mixin ie11($selector) { _:-ms-fullscreen, :root #{$selector} { + /* autoprefixer: off */ @content; } } From 5cb7172f60891d1214af95e95747f26b0718a61f Mon Sep 17 00:00:00 2001 From: Toni Fisler Date: Tue, 24 Jul 2018 15:03:00 +0200 Subject: [PATCH 02/46] update responsive and notes --- .../components/study-plan/study-plan.scss | 15 +++++++++++++-- .../components/study-plan/study-plan.twig | 2 +- .../components/study-plan/study-plan.yml | 10 ++++++++-- assets/config/layout.scss | 1 + 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/assets/components/components/study-plan/study-plan.scss b/assets/components/components/study-plan/study-plan.scss index ec5e9f67a..aafc455ed 100644 --- a/assets/components/components/study-plan/study-plan.scss +++ b/assets/components/components/study-plan/study-plan.scss @@ -3,9 +3,14 @@ .table-like { - $table-grid-template-columns: 1fr 3fr 1fr 3fr 2fr 2fr 2fr 3fr 1fr; + $table-cours-template-columns: minmax(200px, 3fr) minmax(auto, 1fr) minmax(200px, 3fr); + $table-grid-template-columns: 1fr $table-cours-template-columns 2fr 2fr 2fr minmax(200px, 3fr) 1fr; + --table-columns: #{$table-grid-template-columns}; + overflow-x: scroll; + max-width: 100%; + h4 { font-weight: $font-weight-bold; font-size: $font-size-base; @@ -92,6 +97,12 @@ grid-column: 1 / -1; height: 0; } + + .line-down:last-child { + .clear { + display: none; + } + } } // 👊✋🎤🎶 @@ -150,7 +161,7 @@ // Cours is actually 3 divs for the price of one! .cours { display: grid; - grid-template-columns: 3fr 1fr 3fr; + grid-template-columns: $table-cours-template-columns; grid-auto-rows: auto; grid-column: span 3; grid-column-gap: $table-border-width; diff --git a/assets/components/components/study-plan/study-plan.twig b/assets/components/components/study-plan/study-plan.twig index 7c65d7ab8..672e2c7bc 100644 --- a/assets/components/components/study-plan/study-plan.twig +++ b/assets/components/components/study-plan/study-plan.twig @@ -431,7 +431,7 @@ -
+

Mineur : Informatique

diff --git a/assets/components/components/study-plan/study-plan.yml b/assets/components/components/study-plan/study-plan.yml index c7a39b8d7..23a383985 100644 --- a/assets/components/components/study-plan/study-plan.yml +++ b/assets/components/components/study-plan/study-plan.yml @@ -1,4 +1,10 @@ -title: Study plan 🚧 +title: Study plan name: study-plan notes: | -

+ The study plan is a special case of table. The markup cannot be changed and we put in place a CSS Grid layout to display the content. + + Please override the columns width (if they do not fit your needs by using a CSS variable: `
`. + + The default behaviour is kept on IE, the content stays readable (the table might be a bit wonky when some columns are missing though). + + On mobile, the tables are scrollable horizontally. diff --git a/assets/config/layout.scss b/assets/config/layout.scss index 2239bff8e..1bbde1626 100644 --- a/assets/config/layout.scss +++ b/assets/config/layout.scss @@ -25,6 +25,7 @@ [content-start] minmax(min-content, #{col-width(sm, 12)}) [content-end] 1fr [full-end]; + max-width: 100%; @include media-breakpoint-down(sm) { grid-gap: $grid-gutter-width; From aef42df83757dc73416483837b6573a280bd161c Mon Sep 17 00:00:00 2001 From: knuch Date: Mon, 13 Aug 2018 16:31:18 +0200 Subject: [PATCH 03/46] implement key number, key number group and according images --- assets/components/base.scss | 2 ++ .../key-number/key-number-large.twig | 29 ++++++++++++++++++ .../molecules/key-number/key-number.scss | 1 + .../molecules/key-number/key-number.twig | 23 ++++++++++++++ .../molecules/key-number/key-number.yml | 7 +++++ .../key-number-group/key-number-group.scss | 28 +++++++++++++++++ .../key-number-group/key-number-group.twig | 10 ++++++ .../key-number-group/key-number-group.yml | 3 ++ assets/images/key-numbers/collaborations.png | Bin 0 -> 5192 bytes assets/images/key-numbers/earth.png | Bin 0 -> 5008 bytes assets/images/key-numbers/flag.png | Bin 0 -> 1507 bytes assets/images/key-numbers/ranking.png | Bin 0 -> 1934 bytes assets/images/key-numbers/students.png | Bin 0 -> 6171 bytes 13 files changed, 103 insertions(+) create mode 100644 assets/components/molecules/key-number/key-number-large.twig create mode 100644 assets/components/molecules/key-number/key-number.scss create mode 100644 assets/components/molecules/key-number/key-number.twig create mode 100644 assets/components/molecules/key-number/key-number.yml create mode 100644 assets/components/organisms/key-number-group/key-number-group.scss create mode 100644 assets/components/organisms/key-number-group/key-number-group.twig create mode 100644 assets/components/organisms/key-number-group/key-number-group.yml create mode 100644 assets/images/key-numbers/collaborations.png create mode 100644 assets/images/key-numbers/earth.png create mode 100644 assets/images/key-numbers/flag.png create mode 100644 assets/images/key-numbers/ranking.png create mode 100644 assets/images/key-numbers/students.png diff --git a/assets/components/base.scss b/assets/components/base.scss index f723f0a9c..e244874ac 100644 --- a/assets/components/base.scss +++ b/assets/components/base.scss @@ -71,6 +71,7 @@ @import 'molecules/tabs/tabs'; @import 'molecules/collapse-group/collapse-group'; @import 'molecules/card-deck/card-deck'; +@import 'molecules/key-number/key-number'; // // organisms: @@ -89,6 +90,7 @@ @import 'organisms/restauration/restauration'; @import 'organisms/social-feed-group/social-feed-group'; @import 'organisms/headlines/headlines'; +@import 'organisms/key-number-group/key-number-group'; // // content-types: diff --git a/assets/components/molecules/key-number/key-number-large.twig b/assets/components/molecules/key-number/key-number-large.twig new file mode 100644 index 000000000..d59a2eeaf --- /dev/null +++ b/assets/components/molecules/key-number/key-number-large.twig @@ -0,0 +1,29 @@ +{% set icon = icon|default("https://via.placeholder.com/") %} +
+
+
+
+
+

Pays d'origine

+
+
+ +
+
+
+
+
+
+
+

2'706

+

Femmes

+
+
+
+

7'180

+

Hommes

+
+
+
+
+
\ No newline at end of file diff --git a/assets/components/molecules/key-number/key-number.scss b/assets/components/molecules/key-number/key-number.scss new file mode 100644 index 000000000..b9725fa8f --- /dev/null +++ b/assets/components/molecules/key-number/key-number.scss @@ -0,0 +1 @@ +@charset 'utf-8'; \ No newline at end of file diff --git a/assets/components/molecules/key-number/key-number.twig b/assets/components/molecules/key-number/key-number.twig new file mode 100644 index 000000000..6d76e714c --- /dev/null +++ b/assets/components/molecules/key-number/key-number.twig @@ -0,0 +1,23 @@ +{% set icon = icon|default("https://via.placeholder.com/") %} +
+
+
+
Étudiants
+ +
+
+
+
+
+

2'706

+

Femmes

+
+
+
+

7'180

+

Hommes

+
+
+
+
+
\ No newline at end of file diff --git a/assets/components/molecules/key-number/key-number.yml b/assets/components/molecules/key-number/key-number.yml new file mode 100644 index 000000000..8b55d4ebf --- /dev/null +++ b/assets/components/molecules/key-number/key-number.yml @@ -0,0 +1,7 @@ +title: Key Number +name: key-number +wrapper: col-md-6 bg-gray-100 +variants: + - name: large + title: Large + wrapper: 'bg-gray-100' \ No newline at end of file diff --git a/assets/components/organisms/key-number-group/key-number-group.scss b/assets/components/organisms/key-number-group/key-number-group.scss new file mode 100644 index 000000000..54704b3bc --- /dev/null +++ b/assets/components/organisms/key-number-group/key-number-group.scss @@ -0,0 +1,28 @@ +@charset 'utf-8'; + +.key-number-group { + flex-wrap: wrap; + margin-left: $spacer * -0.5; + margin-right: $spacer * -0.5; + + > * { + flex: 0 0 100%; + padding: $spacer * 0.5; + } + + @include media-breakpoint-up(md) { + .key-number { + flex: 1 0 50%; + } + } + + @include media-breakpoint-up(lg) { + .key-number { + flex: 0 0 25%; + } + + .key-number-large { + flex: 0 0 50%; + } + } +} \ No newline at end of file diff --git a/assets/components/organisms/key-number-group/key-number-group.twig b/assets/components/organisms/key-number-group/key-number-group.twig new file mode 100644 index 000000000..d7bbd18ba --- /dev/null +++ b/assets/components/organisms/key-number-group/key-number-group.twig @@ -0,0 +1,10 @@ +
+
+ {% include '@molecules/key-number/key-number-large.twig' %} + {% include '@molecules/key-number/key-number.twig' %} + {% include '@molecules/key-number/key-number.twig' %} + {% include '@molecules/key-number/key-number.twig' %} + {% include '@molecules/key-number/key-number-large.twig' %} + {% include '@molecules/key-number/key-number.twig' %} +
+
\ No newline at end of file diff --git a/assets/components/organisms/key-number-group/key-number-group.yml b/assets/components/organisms/key-number-group/key-number-group.yml new file mode 100644 index 000000000..f144291bb --- /dev/null +++ b/assets/components/organisms/key-number-group/key-number-group.yml @@ -0,0 +1,3 @@ +title: Key number group +name: key-number-group +wrapper: bg-gray-100 \ No newline at end of file diff --git a/assets/images/key-numbers/collaborations.png b/assets/images/key-numbers/collaborations.png new file mode 100644 index 0000000000000000000000000000000000000000..f176617b68feb7e4c7b8a8dd1cf5ba55349d55b4 GIT binary patch literal 5192 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 literal 0 HcmV?d00001 diff --git a/assets/images/key-numbers/ranking.png b/assets/images/key-numbers/ranking.png new file mode 100644 index 0000000000000000000000000000000000000000..1433af3ce37a7af754aa117c6fd60d1875bb49d7 GIT binary patch literal 1934 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 literal 0 HcmV?d00001 From 6f24989a2b81e80a13b21b6bd08f2a7aec739871 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 20 Aug 2018 16:08:04 +0200 Subject: [PATCH 04/46] Clear error message --- publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish.sh b/publish.sh index f3850960d..7bf74e1de 100644 --- a/publish.sh +++ b/publish.sh @@ -22,7 +22,7 @@ then npm whoami || { echo "⚠️ You must be logged in to NPM to push a new release" ; exit 1; } fi -jq --version || { echo "⚠️ You have jq installed on your machine (brew install jq)" ; exit 1; } +jq --version || { echo "⚠️ You need jq installed on your machine (brew install jq)" ; exit 1; } # Proceed ===================================================================== echo "rebuild frontend assets" From 02955363bd2f2f60df5bcb36bef5eba9cb410330 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 20 Aug 2018 16:09:10 +0200 Subject: [PATCH 05/46] Change order according to linter --- assets/components/organisms/header/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/components/organisms/header/header.scss b/assets/components/organisms/header/header.scss index 568954aec..6e47b748c 100644 --- a/assets/components/organisms/header/header.scss +++ b/assets/components/organisms/header/header.scss @@ -25,8 +25,8 @@ } .nav-header { - flex: 1 0 auto; display: flex; + flex: 1 0 auto; flex-flow: row nowrap; margin: 0 0 0 (3.7 * $spacer); padding: 0; From 30ad0423ac5cb5f48f202657e521f3442cc4da3d Mon Sep 17 00:00:00 2001 From: knuch Date: Tue, 21 Aug 2018 10:39:03 +0200 Subject: [PATCH 06/46] implement new question design --- assets/components/molecules/question/question.scss | 11 +++++++++++ assets/components/molecules/question/question.twig | 10 ++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/assets/components/molecules/question/question.scss b/assets/components/molecules/question/question.scss index 4db2ace96..1c52bfe91 100644 --- a/assets/components/molecules/question/question.scss +++ b/assets/components/molecules/question/question.scss @@ -90,6 +90,17 @@ $animation: 0.2s; } } +.question-title { + font-size: $font-size-base * 1.2; + text-transform: uppercase; + color: gray('600'); +} + +.question-subtitle { + font-size: $font-size-base * 1.4; + font-weight: bold; +} + .question-img { flex: 0 0 100%; } diff --git a/assets/components/molecules/question/question.twig b/assets/components/molecules/question/question.twig index 123d1bb12..588bf1fc8 100644 --- a/assets/components/molecules/question/question.twig +++ b/assets/components/molecules/question/question.twig @@ -1,13 +1,14 @@ -

+
{% include '@atoms/picture/picture-question.twig' %}
-

À quoi l'éternel brouillard de San Francisco est-il dû ?

+

Question de science

+

À quoi l'éternel brouillard de San Francisco est-il dû ?

-
+
{% for i in [1,2,3] %} {% endfor %}
+
-
\ No newline at end of file +
From 1c11a9f7ff4e69c22503dccb7a85648fc4daf433 Mon Sep 17 00:00:00 2001 From: knuch Date: Tue, 21 Aug 2018 11:01:42 +0200 Subject: [PATCH 07/46] hotfix: hide nav aside when not using nav aside layout --- assets/components/organisms/nav-aside/nav-aside.scss | 2 ++ assets/components/organisms/nav-main/nav-main.scss | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/assets/components/organisms/nav-aside/nav-aside.scss b/assets/components/organisms/nav-aside/nav-aside.scss index 873f6a1a4..2bca92ad4 100644 --- a/assets/components/organisms/nav-aside/nav-aside.scss +++ b/assets/components/organisms/nav-aside/nav-aside.scss @@ -22,6 +22,8 @@ } .nav-aside-layout .nav-aside-wrapper { + display: block; + @include media-breakpoint-up(xxl){ flex: 0 0 16.1%; max-width: 16.1%; diff --git a/assets/components/organisms/nav-main/nav-main.scss b/assets/components/organisms/nav-main/nav-main.scss index 70a7cde1d..25bfe5d8d 100644 --- a/assets/components/organisms/nav-main/nav-main.scss +++ b/assets/components/organisms/nav-main/nav-main.scss @@ -290,6 +290,10 @@ a.nav-arrow { .nav-close { display: block; } + + .nav-aside-wrapper { + display: none; + } } .desktop-menu-open { From e9b295233e02794837eeb4cdf5be36e4a2d2569a Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 08:22:08 +0200 Subject: [PATCH 08/46] =?UTF-8?q?Rename=20IsHomepage=20to=20isSpecial=20(m?= =?UTF-8?q?ake=20more=20sense=20to=20No=C3=A9mie=20and=20I)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/association-homepage/association-homepage.twig | 2 +- assets/components/pages/blog-homepage/blog-homepage.twig | 2 +- assets/components/pages/event-detail/event-detail.twig | 2 +- .../components/pages/event-homepage/event-homepage.twig | 2 +- assets/components/pages/event-list/event-list.twig | 2 +- assets/components/pages/homepage/homepage.twig | 2 +- assets/components/pages/layout-demo/layout-demo.twig | 4 ++-- assets/components/pages/news-homepage/news-homepage.twig | 2 +- assets/components/pages/people-list/people-list.twig | 2 +- assets/components/templates/base/base.twig | 8 ++++---- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/components/pages/association-homepage/association-homepage.twig b/assets/components/pages/association-homepage/association-homepage.twig index e4ecc3971..48663a0dc 100644 --- a/assets/components/pages/association-homepage/association-homepage.twig +++ b/assets/components/pages/association-homepage/association-homepage.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/pages/blog-homepage/blog-homepage.twig b/assets/components/pages/blog-homepage/blog-homepage.twig index 16084639c..056917de8 100644 --- a/assets/components/pages/blog-homepage/blog-homepage.twig +++ b/assets/components/pages/blog-homepage/blog-homepage.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/pages/event-detail/event-detail.twig b/assets/components/pages/event-detail/event-detail.twig index 71eae2168..e6b076ff3 100644 --- a/assets/components/pages/event-detail/event-detail.twig +++ b/assets/components/pages/event-detail/event-detail.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/pages/event-homepage/event-homepage.twig b/assets/components/pages/event-homepage/event-homepage.twig index 491622046..16b938f27 100644 --- a/assets/components/pages/event-homepage/event-homepage.twig +++ b/assets/components/pages/event-homepage/event-homepage.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/pages/event-list/event-list.twig b/assets/components/pages/event-list/event-list.twig index ce729c09e..c8ea4d2c5 100644 --- a/assets/components/pages/event-list/event-list.twig +++ b/assets/components/pages/event-list/event-list.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/pages/homepage/homepage.twig b/assets/components/pages/homepage/homepage.twig index 6f7fa4915..73656ecc2 100644 --- a/assets/components/pages/homepage/homepage.twig +++ b/assets/components/pages/homepage/homepage.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/pages/layout-demo/layout-demo.twig b/assets/components/pages/layout-demo/layout-demo.twig index 5cb3b201d..bca02b5aa 100644 --- a/assets/components/pages/layout-demo/layout-demo.twig +++ b/assets/components/pages/layout-demo/layout-demo.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} @@ -21,4 +21,4 @@

This .container class is the bootstrap defaut one. When used, It will fallback to the default bootstrap behavior, that cant be divided with rows, columns, etc... (see the Bootstrap documentation)

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/assets/components/pages/news-homepage/news-homepage.twig b/assets/components/pages/news-homepage/news-homepage.twig index c34d5d20d..9f4c9cdf5 100644 --- a/assets/components/pages/news-homepage/news-homepage.twig +++ b/assets/components/pages/news-homepage/news-homepage.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/pages/people-list/people-list.twig b/assets/components/pages/people-list/people-list.twig index 672e34548..eba7af09f 100644 --- a/assets/components/pages/people-list/people-list.twig +++ b/assets/components/pages/people-list/people-list.twig @@ -1,4 +1,4 @@ -{% set isHomepage = true %} +{% set isSpecial = true %} {% extends "@templates/base/base.twig" %} diff --git a/assets/components/templates/base/base.twig b/assets/components/templates/base/base.twig index 7ca0f01aa..50a17931c 100644 --- a/assets/components/templates/base/base.twig +++ b/assets/components/templates/base/base.twig @@ -8,16 +8,16 @@ {% endblock %}
- {% if not isHomepage %} {% block breadcrumb %} + {% if not isSpecial %}
{% include '@atoms/nav-toggle/nav-toggle.twig' %}
{% include '@molecules/breadcrumb/breadcrumb-tagged.twig' %}
+ {% endif %} {% endblock %} - {% endif %} - + {% block nav %} {% include '@organisms/nav-main/nav-main.twig' %} @@ -33,7 +33,7 @@
- {% if not isHomepage %} + {% if not isSpecial %} From 18935018433c4ef1ac4b1ee71e82349afce24122 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 09:14:34 +0200 Subject: [PATCH 09/46] Add review event page - add breadcrumb and reorganize content and add schema.org for events #217 --- .../pages/event-detail/event-detail.twig | 196 +++++++++++------- 1 file changed, 122 insertions(+), 74 deletions(-) diff --git a/assets/components/pages/event-detail/event-detail.twig b/assets/components/pages/event-detail/event-detail.twig index e6b076ff3..2a4c657ce 100644 --- a/assets/components/pages/event-detail/event-detail.twig +++ b/assets/components/pages/event-detail/event-detail.twig @@ -6,98 +6,146 @@ {% include '@organisms/header/header-light.twig' with { site_title: 'Event title' } %} {% endblock %} +{% block breadcrumb %} +
+ {% include '@molecules/breadcrumb/breadcrumb-tagged.twig' %} +
+{% endblock %} + {% block content %} -
-
-
-
-

Summary of the event. For example :

-

L'exposition Kung Fu Motion retrace l’histoire dynamique des arts martiaux traditionnels de la Chine méridionale et de Hong Kong, à travers le prisme de technologies d’archivage de pointe. Située à l’intersection des arts, de la science et des pratiques rituelles, cette exposition expérimentale ouvre de nouvelles perspectives sur notre rapport au patrimoine culturel immatériel.

+
+
+
+
+
+

Event title may contains several words on maybe multiple lines, who knows?

+
-
- {% include '@atoms/picture/picture.twig' %} +
+
+ {% include '@atoms/picture/picture.twig' %} +
+
+
+

Détails de l'événement

+ + + + + + + + + + + + + + + + + + + + + + + +
Date + + 13.01.2018 - 12:00 → 13:30 + +
AvecProf Mohamed Bentires-Alj
Lieu +
+ SV 2811 +
+ EPFL
+ Lausanne, + 1015 +
+
+
Organisé parDouglas Hanahan
Prix + +
Accès libre
+ + +
+
+ {% include '@atoms/button/button.twig' %} +
+
+
-
-
-
-
-

Details about the event. For example :

-

L’exposition Kung Fu Motion découle d’une initiative de recherche majeure initiée en 2012, la « Hong Kong Martial Arts Living Archive » (les Archives vivantes des arts martiaux de Hong Kong). Cette recherche en cours est une collaboration entre la International Guoshu Association, City University of Hong Kong, et le Laboratoire de muséologie expérimentale (eM+) de l’Institut des humanités digitales de l’EPFL.

Hong Kong est un extraordinaire réservoir pour qui s’intéresse au patrimoine immatériel lié aux arts martiaux. Entre le début et ma moitié du XXème siècle, Hong Kong servit de refuge à des milliers d’immigrants de Chine, parmi lesquels quelques-uns des plus grands artistes martiaux au monde. Si leurs pratiques, rendues célèbres mondialement par le cinéma de Jackie Chan et autres, y demeurent présentes, la globalisation, l’urbanisation et le nombre décroissant de pratiquants les menacent de disparition.

« Kung Fu Motion examine les stratégies permettant d’encoder, de récupérer et de reproduire le patrimoine immatériel de manière à permettre à ces archives d’être « vivantes » dans le présent », explique la Prof. Sarah Kenderdine, directrice d’ArtLab et du laboratoire eM+ à l’EPFL.

-
- {% include '@atoms/button/button.twig' %} +
+
+
+

An event about technology

+

L’exposition Kung Fu Motion découle d’une initiative de recherche majeure initiée en 2012, la « Hong Kong Martial Arts Living Archive » (les Archives vivantes des arts martiaux de Hong Kong). Cette recherche en cours est une collaboration entre la International Guoshu Association, City University of Hong Kong, et le Laboratoire de muséologie expérimentale (eM+) de l’Institut des humanités digitales de l’EPFL.

Hong Kong est un extraordinaire réservoir pour qui s’intéresse au patrimoine immatériel lié aux arts martiaux. Entre le début et ma moitié du XXème siècle, Hong Kong servit de refuge à des milliers d’immigrants de Chine, parmi lesquels quelques-uns des plus grands artistes martiaux au monde. Si leurs pratiques, rendues célèbres mondialement par le cinéma de Jackie Chan et autres, y demeurent présentes, la globalisation, l’urbanisation et le nombre décroissant de pratiquants les menacent de disparition.

« Kung Fu Motion examine les stratégies permettant d’encoder, de récupérer et de reproduire le patrimoine immatériel de manière à permettre à ces archives d’être « vivantes » dans le présent », explique la Prof. Sarah Kenderdine, directrice d’ArtLab et du laboratoire eM+ à l’EPFL.

+
+ {% include '@atoms/button/button.twig' %} +
-
-
-
- {% include '@atoms/button/button.twig' %} -
+
-
-

Liens

- -
-
-

Date et lieu

-
    -
  • Vernissage le vendredi 27 avril à 18h
    • -
  • Exposition à voir du 28 avril au 26 août 2018
    • -
  • Bâtiment ArtLab
    • -
-
+
+

Liens

+ +
-
-

Informations pratiques

-
    -
  • Organisation Bureau ArtLab
    • -
  • Accessibilité Tout public
    • -
  • Accès Libre
    • -
-
-
-

Abonnez-vous aux publications de Mediacom

-
- +
+

Informations pratiques

+
    +
  • Organisation Bureau ArtLab
    • +
  • Accessibilité Tout public
    • +
-
-
-

Mots-clés

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Itaque, natus.

-
+
+

Abonnez-vous aux publications de Mediacom

+
+ +
+
-
-

Partager sur

-
- - - - - - +
+

Mots-clés

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Itaque, natus.

-
+
+

Partager sur

+ +
+ +
From 5faeb1f5701923168ee60e0fe5d3a1237477acde Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 09:25:28 +0200 Subject: [PATCH 10/46] Add space before pagination #181 --- assets/components/pages/news-homepage/news-homepage.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/components/pages/news-homepage/news-homepage.twig b/assets/components/pages/news-homepage/news-homepage.twig index 9f4c9cdf5..3497c6de0 100644 --- a/assets/components/pages/news-homepage/news-homepage.twig +++ b/assets/components/pages/news-homepage/news-homepage.twig @@ -21,7 +21,9 @@
{% include '@content-types/news/news.twig' %} - {% include '@molecules/pagination/pagination.twig' %} +
+ {% include '@molecules/pagination/pagination.twig' %} +
From 3a9ce7e4739bb6a4c49b415db808986eb015a401 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 09:35:42 +0200 Subject: [PATCH 11/46] Add schools listing in sidebar menu #169 --- assets/components/pages/facultes/facultes.twig | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/assets/components/pages/facultes/facultes.twig b/assets/components/pages/facultes/facultes.twig index 855b4fa6f..3e92b6cf1 100644 --- a/assets/components/pages/facultes/facultes.twig +++ b/assets/components/pages/facultes/facultes.twig @@ -1,5 +1,11 @@ {% extends "@templates/base/base.twig" %} +{% set nav_aside_items = [{ + label: "Facultés", + children: ["Architecture, Civil and Environmental Engineering ENAC", "Basic Sciences SB", "Engineering STI", "Computer and Communication Sciences IC", "Life Sciences SV", "Management of Technology CDM", "College of Humanities CDH", "EPFL Middle East"] +}] %} +{% set nav_aside_active = 0 %} + {% block grid %}{% endblock %} {% block content %} @@ -7,7 +13,6 @@

Les facultés de l'EPFL

-

What is a faculty ? Explain in a few sentences.

@@ -17,9 +22,8 @@ {% for i in 1..8 %}
{% include '@content-types/faculty/faculty.twig' %} -
+
{% endfor %}
{% endblock %} - From ccb8488613f194cb854057cb9754947e789c4527 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 09:46:49 +0200 Subject: [PATCH 12/46] #161 add footerlight --- .../association-homepage/association-homepage.twig | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/assets/components/pages/association-homepage/association-homepage.twig b/assets/components/pages/association-homepage/association-homepage.twig index 48663a0dc..bb78f1889 100644 --- a/assets/components/pages/association-homepage/association-homepage.twig +++ b/assets/components/pages/association-homepage/association-homepage.twig @@ -7,7 +7,6 @@ {% endblock %} {% block content %} -
{% include '@organisms/hero/hero.twig' with {title: 'Association title', cover_path: 'images/cover/cover01_', content: 'Welcome to our association homepage'} %}
@@ -54,7 +53,14 @@
{% include '@organisms/contact/contact-banner.twig' %}
- - {% endblock %} +{% block footer_container %} +
+
+ {% block footer %} + {% include '@organisms/footer/footer-light.twig' %} + {% endblock %} +
+
+{% endblock %} From 09c3cae4158843ba0c7827581a4b05df1e8ed63f Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 09:47:03 +0200 Subject: [PATCH 13/46] remove unused closing div --- .../pages/event-detail/event-detail.twig | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/assets/components/pages/event-detail/event-detail.twig b/assets/components/pages/event-detail/event-detail.twig index 2a4c657ce..68fea8cf5 100644 --- a/assets/components/pages/event-detail/event-detail.twig +++ b/assets/components/pages/event-detail/event-detail.twig @@ -151,14 +151,12 @@
{% endblock %} - {% block footer_container %} -
-
- {% block footer %} - {% include '@organisms/footer/footer-light.twig' %} - {% endblock %} -
-
- {% endblock %} +{% block footer_container %} +
+
+ {% block footer %} + {% include '@organisms/footer/footer-light.twig' %} + {% endblock %}
+{% endblock %} From 9fdf644a165738ffd4136f2d6585a662352ba638 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 09:48:58 +0200 Subject: [PATCH 14/46] add footer light #168 --- .../components/pages/blog-homepage/blog-homepage.twig | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/assets/components/pages/blog-homepage/blog-homepage.twig b/assets/components/pages/blog-homepage/blog-homepage.twig index 056917de8..486bed77c 100644 --- a/assets/components/pages/blog-homepage/blog-homepage.twig +++ b/assets/components/pages/blog-homepage/blog-homepage.twig @@ -22,7 +22,14 @@
{% include '@molecules/pagination/pagination-center.twig' %}
- - {% endblock %} +{% block footer_container %} +
+
+ {% block footer %} + {% include '@organisms/footer/footer-light.twig' %} + {% endblock %} +
+
+{% endblock %} From 64515149fde4ef0fc442887940a1bc7f44798ff2 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 09:59:59 +0200 Subject: [PATCH 15/46] change contact banner white background by default + add footer light to #162 event homepage --- .../organisms/contact/contact-banner.twig | 54 +++++++++---------- .../pages/event-homepage/event-homepage.twig | 9 ++++ .../pages/lab-homepage/lab-homepage.twig | 4 +- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/assets/components/organisms/contact/contact-banner.twig b/assets/components/organisms/contact/contact-banner.twig index 2deb5dfe9..609b8c5ae 100644 --- a/assets/components/organisms/contact/contact-banner.twig +++ b/assets/components/organisms/contact/contact-banner.twig @@ -1,32 +1,30 @@ -
-
-
-

Contact

-

Les guichets des « services aux étudiant-e-s » est le point de contact central pour traiter vos demandes.

-
-
Lundi à jeudi
-
›
-
-
-
Vendredi
-
›
-
-

- services.etudiants@epfl.ch -

-
-

- +41 21 693 43 45 -

-
-
- EPFL AA-DAF
- BP 1229 (bâtiment BP) Station 16
- CH - 1015 Lausanne -
+
+
+

Contact

+

Les guichets des « services aux étudiant-e-s » est le point de contact central pour traiter vos demandes.

+
+
Lundi à jeudi
+
›
-
- {% include '@molecules/map/map.twig' %} +
+
Vendredi
+
›
+

+ services.etudiants@epfl.ch +

+
+

+ +41 21 693 43 45 +

+
+
+ EPFL AA-DAF
+ BP 1229 (bâtiment BP) Station 16
+ CH - 1015 Lausanne +
+
+
+ {% include '@molecules/map/map.twig' %}
diff --git a/assets/components/pages/event-homepage/event-homepage.twig b/assets/components/pages/event-homepage/event-homepage.twig index 16b938f27..cb517d0c7 100644 --- a/assets/components/pages/event-homepage/event-homepage.twig +++ b/assets/components/pages/event-homepage/event-homepage.twig @@ -55,3 +55,12 @@ {% endblock %} +{% block footer_container %} +
+
+ {% block footer %} + {% include '@organisms/footer/footer-light.twig' %} + {% endblock %} +
+
+{% endblock %} diff --git a/assets/components/pages/lab-homepage/lab-homepage.twig b/assets/components/pages/lab-homepage/lab-homepage.twig index 02f10114e..58813153d 100644 --- a/assets/components/pages/lab-homepage/lab-homepage.twig +++ b/assets/components/pages/lab-homepage/lab-homepage.twig @@ -69,7 +69,9 @@
- {% include '@organisms/contact/contact-banner.twig' %} +
+ {% include '@organisms/contact/contact-banner.twig' %} +
From d6429f5d5a16a674f0ab417b0a65834434047ef1 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 10:01:32 +0200 Subject: [PATCH 16/46] remove uneccessary margin --- .../organisms/footer/footer-light.twig | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/assets/components/organisms/footer/footer-light.twig b/assets/components/organisms/footer/footer-light.twig index 0623569d6..04099feb7 100644 --- a/assets/components/organisms/footer/footer-light.twig +++ b/assets/components/organisms/footer/footer-light.twig @@ -1,28 +1,24 @@
-
-
-
- - Logo EPFL, École polytechnique fédérale de Lausanne - -
-
-
-
    -
  • Contact
    • -
  • EPFL CH-1015 Lausanne
    • -
  • +41 21 693 11 11
    • -
-

- Suivre les pulsations de l’EPFL sur les réseaux sociaux - - {% include '@atoms/social-icon/social-icon-link-group.twig' with { negative: true } %} - -

- {% include "@organisms/footer/footer-legal.twig" %} -
-
+
+ + Logo EPFL, École polytechnique fédérale de Lausanne + +
+
+
+
    +
  • Contact
    • +
  • EPFL CH-1015 Lausanne
    • +
  • +41 21 693 11 11
    • +
+

+ Suivre les pulsations de l’EPFL sur les réseaux sociaux + + {% include '@atoms/social-icon/social-icon-link-group.twig' with { negative: true } %} + +

+ {% include "@organisms/footer/footer-legal.twig" %}
From 6baaa44eef9de2e2828ad0340ac30860e41e0eac Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 10:14:21 +0200 Subject: [PATCH 17/46] Remvoe clsing divs --- assets/components/pages/programs/programs.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/components/pages/programs/programs.twig b/assets/components/pages/programs/programs.twig index a7f8d3a84..bfccfa05f 100644 --- a/assets/components/pages/programs/programs.twig +++ b/assets/components/pages/programs/programs.twig @@ -28,4 +28,3 @@
{% endblock %} - From 1bfaca36d721e2fcceed05bd319701ea7596fd5a Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Thu, 23 Aug 2018 10:14:46 +0200 Subject: [PATCH 18/46] Add breadcrumb and headerlight #222 --- .../components/pages/people-list/people-list.twig | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/assets/components/pages/people-list/people-list.twig b/assets/components/pages/people-list/people-list.twig index eba7af09f..69cd9a096 100644 --- a/assets/components/pages/people-list/people-list.twig +++ b/assets/components/pages/people-list/people-list.twig @@ -2,6 +2,16 @@ {% extends "@templates/base/base.twig" %} +{% block header %} + {% include '@organisms/header/header-light.twig' with { site_title: 'People' } %} +{% endblock %} + +{% block breadcrumb %} +
+ {% include '@molecules/breadcrumb/breadcrumb-tagged.twig' %} +
+{% endblock %} + {% block content %}
@@ -28,6 +38,4 @@ {% endblock %}
- {% endblock %} -
-
+{% endblock %} From dd5b54c8de678525fea90cc925c5db73d8e81e13 Mon Sep 17 00:00:00 2001 From: Noemie Date: Thu, 23 Aug 2018 11:13:32 +0200 Subject: [PATCH 19/46] add education page --- .../components/pages/education/education.twig | 73 +++++++++++++++++++ .../components/pages/education/education.yml | 2 + 2 files changed, 75 insertions(+) create mode 100644 assets/components/pages/education/education.twig create mode 100644 assets/components/pages/education/education.yml diff --git a/assets/components/pages/education/education.twig b/assets/components/pages/education/education.twig new file mode 100644 index 000000000..51c1e652d --- /dev/null +++ b/assets/components/pages/education/education.twig @@ -0,0 +1,73 @@ +{% extends "@templates/base/base.twig" %} + +{% block content %} + +
+
+
+

Education

+
+
+ IMAGE DESCRIPTION HERE +
+
+
+ +
+

+ Treize filières de formation dans les sciences de l’ingénieur, des programmes doctoraux de choix, des laboratoires de pointe dirigés par des professeurs de réputation internationale, un campus moderne en plein développement, des liens privilégiés avec l’industrie: l’EPFL offre des conditions d’études hors du commun aux jeunes qui envisagent d’amorcer une formation supérieure dans le domaine des sciences et de la technique. +

+
+ +
+

Composant "chiffre clés"

+
+ +
+

Cursus

+
+
+ {% include '@content-types/cursus/cursus.twig' %} +
+
+ {% include '@content-types/cursus/cursus.twig' %} +
+
+ {% include '@content-types/cursus/cursus.twig' %} +
+
+
+ +
+ {% include '@content-types/news/news-latest-two.twig' %} +
+ +
+
+
+

The next events

+ {% include '@organisms/card-slider/card-slider.twig' %} +
+
+
+ +
+
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+ {% include '@molecules/links-group/links-group.twig' %} +
+
+
+ +
+ {% include '@organisms/contact/contact-banner.twig' %} +
+ + +{% endblock %} diff --git a/assets/components/pages/education/education.yml b/assets/components/pages/education/education.yml new file mode 100644 index 000000000..ce6c0cf15 --- /dev/null +++ b/assets/components/pages/education/education.yml @@ -0,0 +1,2 @@ +name: education +title: Education \ No newline at end of file From b9cbf07118d299819b58cf24006f798dfd143106 Mon Sep 17 00:00:00 2001 From: Noemie Date: Thu, 23 Aug 2018 11:31:42 +0200 Subject: [PATCH 20/46] add innovation page --- .../pages/innovation/innovation.twig | 70 +++++++++++++++++++ .../pages/innovation/innovation.yml | 2 + 2 files changed, 72 insertions(+) create mode 100644 assets/components/pages/innovation/innovation.twig create mode 100644 assets/components/pages/innovation/innovation.yml diff --git a/assets/components/pages/innovation/innovation.twig b/assets/components/pages/innovation/innovation.twig new file mode 100644 index 000000000..05b139bfe --- /dev/null +++ b/assets/components/pages/innovation/innovation.twig @@ -0,0 +1,70 @@ +{% extends "@templates/base/base.twig" %} + +{% block content %} + +
+
+
+

Innovation

+
+
+ IMAGE DESCRIPTION HERE +
+
+
+ +
+

+ La vice-présidence pour l'innovation (VPI) est l'interface entre l'EPFL et les milieux économiques. Elle encourage l'entrepreneuriat et la création de start-ups, elle favorise l'innovation et la recherche en aidant l'industrie à développer des partenariats avec l'EPFL. la VPI est également en charge de la plateforme Switzerland Innovation Park Network West, qui est étroitement liée à l'extension des autres campus de l'EPFL. +

+
+ +
+

Composant "chiffre clés"

+
+ + +
+ {% include '@content-types/news/news-latest-two.twig' %} +
+ +
+
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+
+ +
+
+
+

The next events

+ {% include '@organisms/card-slider/card-slider.twig' %} +
+
+
+ +
+
+
+ {% include '@organisms/contact/contact-compact.twig' %} +
+
+ {% include '@molecules/links-group/links-group.twig' %} +
+
+
+ +{% endblock %} diff --git a/assets/components/pages/innovation/innovation.yml b/assets/components/pages/innovation/innovation.yml new file mode 100644 index 000000000..c2e1233f0 --- /dev/null +++ b/assets/components/pages/innovation/innovation.yml @@ -0,0 +1,2 @@ +name: innovation +title: Innovation \ No newline at end of file From 255b439802c8e8df9384088d76742e1006161311 Mon Sep 17 00:00:00 2001 From: Noemie Date: Thu, 23 Aug 2018 11:43:37 +0200 Subject: [PATCH 21/46] add about page --- assets/components/pages/about/about.twig | 91 ++++++++++++++++++++++++ assets/components/pages/about/about.yml | 2 + 2 files changed, 93 insertions(+) create mode 100644 assets/components/pages/about/about.twig create mode 100644 assets/components/pages/about/about.yml diff --git a/assets/components/pages/about/about.twig b/assets/components/pages/about/about.twig new file mode 100644 index 000000000..e7476a9e4 --- /dev/null +++ b/assets/components/pages/about/about.twig @@ -0,0 +1,91 @@ +{% extends "@templates/base/base.twig" %} + +{% block content %} + +
+
+
+

About

+
+
+ IMAGE DESCRIPTION HERE +
+
+
+ +
+

+ L'EPFL est la plus cosmopolite des universités techniques européennes. Elle accueille des étudiants, professeurs et collaborateurs de plus de 120 nationalités. A vocation à la fois suisse et internationale, l’EPFL est centrée sur trois missions : l’enseignement, la recherche et le transfert de technologies. L’EPFL collabore avec un important réseau de partenaires comprenant notamment les autres universités et hautes écoles, les écoles secondaires et gymnases, l’industrie et l’économie, les milieux politiques et le grand public, ceci dans le but d’avoir un véritable impact pour la société. +

+
+ +
+
+
+
+ {% include '@molecules/links-group/links-group.twig' %} +
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+ {% include '@molecules/links-group/links-group-teaser.twig' %} +
+
+
+
+ +
+ {% include '@content-types/news/news-latest-two.twig' %} +
+ +
+
+
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+ {% include '@molecules/links-group/links-group.twig' %} +
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+
+
+ +
+
+
+

The next events

+ {% include '@organisms/card-slider/card-slider.twig' %} +
+
+
+ +
+
+
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+
+
+ +
+
+
+ Quote +
+
+ {% include '@content-types/basic-page/basic-page.twig' %} +
+
+
+ +{% endblock %} diff --git a/assets/components/pages/about/about.yml b/assets/components/pages/about/about.yml new file mode 100644 index 000000000..61b62f03e --- /dev/null +++ b/assets/components/pages/about/about.yml @@ -0,0 +1,2 @@ +name: about +title: About \ No newline at end of file From f20d4e8bb0dbba663b6fe4046dd78e9cc16ad23e Mon Sep 17 00:00:00 2001 From: Noemie Date: Thu, 23 Aug 2018 12:09:59 +0200 Subject: [PATCH 22/46] add schema to event #262 --- .../content-types/event/event-listing.twig | 10 +++++----- assets/components/content-types/event/event.twig | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/components/content-types/event/event-listing.twig b/assets/components/content-types/event/event-listing.twig index a9a7b7fba..dab645a9e 100644 --- a/assets/components/content-types/event/event-listing.twig +++ b/assets/components/content-types/event/event-listing.twig @@ -6,15 +6,15 @@ {% include '@atoms/picture/picture.twig' with {'variant':'news-thumb'} %}
-

Startup Acceleration Workshops

+

Startup Acceleration Workshops

{% block date %} - 10.01.2018 - 13:00 - 17:30 + 10.01.2018 + 13:00 + 17:30 {% endblock %}

- {% block info %}Lieu : ArtLab EPFL
Catégorie : Événements culturel
{% endblock %} + {% block info %}Lieu : ArtLab EPFL
Catégorie : Événements culturel
{% endblock %}

diff --git a/assets/components/content-types/event/event.twig b/assets/components/content-types/event/event.twig index 90214889a..eacd07d16 100644 --- a/assets/components/content-types/event/event.twig +++ b/assets/components/content-types/event/event.twig @@ -6,16 +6,16 @@ {% endblock %} -

{% block title %}Startup Acceleration Workshops{% endblock %}

+

{% block title %}Startup Acceleration Workshops{% endblock %}

{% block summary %}{% endblock -%}
{% block date %} - 10.01.2018 - 13:00 - 17:30 + 10.01.2018 + 13:00 + 17:30 {% endblock %} -

- {% block info %}Lieu : ArtLab EPFL
Catégorie : Événements culturel
{% endblock %} +

+ {% block info %}Lieu : ArtLab EPFL
Catégorie : Événements culturel
{% endblock %}

From 188e90be31ca03b8c6a439e6d52fdf4b2f44f367 Mon Sep 17 00:00:00 2001 From: Noemie Date: Thu, 23 Aug 2018 12:20:53 +0200 Subject: [PATCH 23/46] add schema to article ##263 --- .../content-types/news/news-basic-teaser.twig | 10 +++++----- .../content-types/news/news-distinction.twig | 6 +++--- .../content-types/news/news-press-release.twig | 10 +++++----- assets/components/content-types/news/news.twig | 8 ++++---- assets/components/pages/news-detail/news-detail.twig | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/assets/components/content-types/news/news-basic-teaser.twig b/assets/components/content-types/news/news-basic-teaser.twig index 67cde3662..5d8aadb10 100644 --- a/assets/components/content-types/news/news-basic-teaser.twig +++ b/assets/components/content-types/news/news-basic-teaser.twig @@ -4,13 +4,13 @@ a portrait of professor Xile Hu {% endblock %} -
-

News title

+
+

News title

- 11.09.17 - Recherche + + Recherche Prix et récompenses
-

The EPFL favors closer ties to industry leading research in order to best meet the scientific, technological and societal

+

The EPFL favors closer ties to industry leading research in order to best meet the scientific, technological and societal

diff --git a/assets/components/content-types/news/news-distinction.twig b/assets/components/content-types/news/news-distinction.twig index 4194fcc94..c621ee706 100644 --- a/assets/components/content-types/news/news-distinction.twig +++ b/assets/components/content-types/news/news-distinction.twig @@ -4,8 +4,8 @@ a portrait of professor Xile Hu {% endblock %} -
-

EPFL doctorate Award 2017 – Priscilla Briquez

-

Text teaser — EPFL biologists and geneticists have uncovered how the circadian clock orchestrates the 24-hour cycle of gene expression by regulating the structure of chromatin, the tightly wound DNA-protein complex of the cell

+
+

EPFL doctorate Award 2017 – Priscilla Briquez

+

Text teaser — EPFL biologists and geneticists have uncovered how the circadian clock orchestrates the 24-hour cycle of gene expression by regulating the structure of chromatin, the tightly wound DNA-protein complex of the cell

diff --git a/assets/components/content-types/news/news-press-release.twig b/assets/components/content-types/news/news-press-release.twig index 1bc534ae2..4fe3423cc 100644 --- a/assets/components/content-types/news/news-press-release.twig +++ b/assets/components/content-types/news/news-press-release.twig @@ -4,16 +4,16 @@ a portrait of professor Xile Hu {% endblock %} -
+
Press release - +
-

Two months in Pyeongchang to study Korean snowfalls

+

Two months in Pyeongchang to study Korean snowfalls

ENAC - Environment + Environment
-

Text teaser — EPFL biologists and geneticists have uncovered how the circadian clock orchestrates the 24-hour cycle of gene expression by regulating the structure of chromatin, the tightly wound DNA-protein complex of the cell

+

Text teaser — EPFL biologists and geneticists have uncovered how the circadian clock orchestrates the 24-hour cycle of gene expression by regulating the structure of chromatin, the tightly wound DNA-protein complex of the cell

diff --git a/assets/components/content-types/news/news.twig b/assets/components/content-types/news/news.twig index 3a0f8243c..678b27877 100644 --- a/assets/components/content-types/news/news.twig +++ b/assets/components/content-types/news/news.twig @@ -5,11 +5,11 @@
{% include '@atoms/picture/picture.twig' with {'variant':'news-thumb'} %}
-
-

Physics: new e-books for the AIAA Education Series

+
+

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 + + — 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/assets/components/pages/news-detail/news-detail.twig b/assets/components/pages/news-detail/news-detail.twig index 96df8db21..f249df137 100644 --- a/assets/components/pages/news-detail/news-detail.twig +++ b/assets/components/pages/news-detail/news-detail.twig @@ -3,8 +3,8 @@ {% block grid %}{% endblock %} {% block content %} -
-

Des connexions se créent pour dépasser la paralysie

+
+

Des connexions se créent pour dépasser la paralysie

From 69130259076af0ebcd4ee5171717574de2dc9702 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Fri, 24 Aug 2018 08:45:57 +0200 Subject: [PATCH 24/46] =?UTF-8?q?=F0=9F=92=84=20add=20nicer=20bottom=20spa?= =?UTF-8?q?cing=20for=20footer-light?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/components/organisms/footer/footer-light.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/components/organisms/footer/footer-light.twig b/assets/components/organisms/footer/footer-light.twig index 04099feb7..2370a0f03 100644 --- a/assets/components/organisms/footer/footer-light.twig +++ b/assets/components/organisms/footer/footer-light.twig @@ -5,7 +5,7 @@ Logo EPFL, École polytechnique fédérale de Lausanne
-
+
  • Contact
    • From e87d6c0e9e810983cd64bb06ab3d02e14b01bec5 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Fri, 24 Aug 2018 10:04:27 +0200 Subject: [PATCH 25/46] =?UTF-8?q?=F0=9F=90=9B=20fix=20missing=20round=20op?= =?UTF-8?q?tion=20on=20social-icon=20variant=20#228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atoms/social-icon/social-icon-round-discrete-link.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/components/atoms/social-icon/social-icon-round-discrete-link.twig b/assets/components/atoms/social-icon/social-icon-round-discrete-link.twig index 2e53afe4f..402341e3d 100644 --- a/assets/components/atoms/social-icon/social-icon-round-discrete-link.twig +++ b/assets/components/atoms/social-icon/social-icon-round-discrete-link.twig @@ -1,3 +1,4 @@ {% include "@atoms/social-icon/social-icon-link.twig" with { - discrete: true + discrete: true, + round: true } %} From 7e3e9526e6fa40f8de53b98fdb604f9348523fc9 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Fri, 24 Aug 2018 10:56:57 +0200 Subject: [PATCH 26/46] =?UTF-8?q?=F0=9F=92=84=20update=20and=20extend=20qu?= =?UTF-8?q?estion=20component=20for=20science=20question=20content=20type?= =?UTF-8?q?=20#229?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../science-question/science-question.twig | 10 ++++++- .../molecules/question/question.scss | 8 +++++- .../molecules/question/question.twig | 28 ++++++++++++------- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/assets/components/content-types/science-question/science-question.twig b/assets/components/content-types/science-question/science-question.twig index 2475b8e64..a9c98c3bd 100644 --- a/assets/components/content-types/science-question/science-question.twig +++ b/assets/components/content-types/science-question/science-question.twig @@ -1 +1,9 @@ -{% include '@molecules/question/question.twig' %} +{% include '@molecules/question/question.twig' with { + type: 'Question de science', + options: [ + 'À la pollution résultant de la circulation', + 'Au fait que la Baie est plus basse que le niveau de l’Océan', + 'Aux aérosols marins en suspension dans la région' + ], + vote: true +} %} diff --git a/assets/components/molecules/question/question.scss b/assets/components/molecules/question/question.scss index 4db2ace96..d049edbcc 100644 --- a/assets/components/molecules/question/question.scss +++ b/assets/components/molecules/question/question.scss @@ -23,9 +23,10 @@ $animation: 0.2s; } .custom-control-label { + flex: 1 1 auto; + flex-basis: 0; position: relative; transition: $animation; - flex-grow: 1; // red icon styles &:before { @@ -76,6 +77,7 @@ $animation: 0.2s; // checked animation and styles .custom-control-input:checked + .custom-control-label { + @extend .custom-control-label:hover; z-index: 10; .custom-control-label-content { @@ -130,6 +132,10 @@ $animation: 0.2s; } } + .question-content { + padding: $spacer 0; + } + // checked styles .custom-control-input:checked + .custom-control-label { z-index: 10; diff --git a/assets/components/molecules/question/question.twig b/assets/components/molecules/question/question.twig index 123d1bb12..035f53185 100644 --- a/assets/components/molecules/question/question.twig +++ b/assets/components/molecules/question/question.twig @@ -5,18 +5,26 @@
-

À quoi l'éternel brouillard de San Francisco est-il dû ?

+ {% if type %}

{{ type }}

{% endif %} +

À quoi l’éternel brouillard de San Francisco est-il principalement dû ?

- {% for i in [1,2,3] %} - - + {% set options = options|default(['Option 1', 'Option 2', 'Option 3']) %} + {% for option in options %} + + {% endfor %}
+ + {% if vote %} +
+ Voter +
+ {% endif %}
-
\ No newline at end of file +
From db95b355259ba00765c46bd3d9379f3e2394e756 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Fri, 24 Aug 2018 10:59:23 +0200 Subject: [PATCH 27/46] =?UTF-8?q?=F0=9F=94=A8=20refactor=20bachelor-projec?= =?UTF-8?q?t=20content-type=20#230?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content-types/bachelor-project/bachelor-project.twig | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/components/content-types/bachelor-project/bachelor-project.twig b/assets/components/content-types/bachelor-project/bachelor-project.twig index a5423826a..e3b4ab688 100644 --- a/assets/components/content-types/bachelor-project/bachelor-project.twig +++ b/assets/components/content-types/bachelor-project/bachelor-project.twig @@ -2,14 +2,12 @@
Bachelor - BioS

Generic user interfaces for data manipulation programs

- {% include '@molecules/avatar-teaser/avatar-teaser.twig' %} Project details
From 9c8892cb8dfc397d9cce466110fd35500b786934 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Fri, 24 Aug 2018 11:21:41 +0200 Subject: [PATCH 28/46] =?UTF-8?q?=F0=9F=92=84=20add=20default=20profile=20?= =?UTF-8?q?picture=20for=20people=20details=20page=20#182?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/components/pages/people-detail/people-detail.twig | 6 ++++++ assets/svg/avatar-placeholder.svg | 1 + 2 files changed, 7 insertions(+) create mode 100644 assets/svg/avatar-placeholder.svg diff --git a/assets/components/pages/people-detail/people-detail.twig b/assets/components/pages/people-detail/people-detail.twig index 206e9fee7..e91b7449e 100644 --- a/assets/components/pages/people-detail/people-detail.twig +++ b/assets/components/pages/people-detail/people-detail.twig @@ -22,7 +22,13 @@ {# Person avatar and buttons #}
+ + + + + Avatar placeholder image

Habilitation Dr. Ing

diff --git a/assets/svg/avatar-placeholder.svg b/assets/svg/avatar-placeholder.svg new file mode 100644 index 000000000..76056f160 --- /dev/null +++ b/assets/svg/avatar-placeholder.svg @@ -0,0 +1 @@ + From 160a32be283e4fdf972104cdf62506af086a1dfc Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Fri, 24 Aug 2018 12:08:09 +0200 Subject: [PATCH 29/46] =?UTF-8?q?=E2=9C=A8=20add=20loader=20and=20browse?= =?UTF-8?q?=20button=20loading=20state=20#213?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/components/atoms/loader/loader.scss | 16 ++++++++++++++++ assets/components/atoms/loader/loader.twig | 1 + assets/components/atoms/loader/loader.yml | 2 ++ .../atoms/nav-toggle/nav-toggle.scss | 18 ++++++++++++++---- .../atoms/nav-toggle/nav-toggle.twig | 1 + .../components/atoms/nav-toggle/nav-toggle.yml | 4 +++- assets/components/base.scss | 1 + 7 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 assets/components/atoms/loader/loader.scss create mode 100644 assets/components/atoms/loader/loader.twig create mode 100644 assets/components/atoms/loader/loader.yml diff --git a/assets/components/atoms/loader/loader.scss b/assets/components/atoms/loader/loader.scss new file mode 100644 index 000000000..41ce58b57 --- /dev/null +++ b/assets/components/atoms/loader/loader.scss @@ -0,0 +1,16 @@ +@charset 'utf-8'; + +@keyframes rotation { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } +} + +.loader { + display: inline-block; + width: 0.9rem; + height: 0.9rem; + border: 3px solid gray('200'); + border-right-color: gray('600'); + border-radius: 100%; + animation: rotation 1s linear infinite; +} diff --git a/assets/components/atoms/loader/loader.twig b/assets/components/atoms/loader/loader.twig new file mode 100644 index 000000000..f23547956 --- /dev/null +++ b/assets/components/atoms/loader/loader.twig @@ -0,0 +1 @@ + diff --git a/assets/components/atoms/loader/loader.yml b/assets/components/atoms/loader/loader.yml new file mode 100644 index 000000000..406df8b53 --- /dev/null +++ b/assets/components/atoms/loader/loader.yml @@ -0,0 +1,2 @@ +title: Loader +name: loader \ No newline at end of file diff --git a/assets/components/atoms/nav-toggle/nav-toggle.scss b/assets/components/atoms/nav-toggle/nav-toggle.scss index f9654959e..b80c4ddf3 100644 --- a/assets/components/atoms/nav-toggle/nav-toggle.scss +++ b/assets/components/atoms/nav-toggle/nav-toggle.scss @@ -9,15 +9,25 @@ padding: $spacer / 4 $spacer / 2; &:hover { cursor: pointer; } + .loader { + display: none; + margin-right: 0.2rem; + } + + &.is-loading { + .loader { display: inline-block; } + .icon { display: none !important; } + } + .icon { margin-right: 0.2rem; font-size: 0.7rem; - &:first-child { + &:first-of-type { display: block; } - &:last-child { + &:last-of-type { display: none; } } @@ -32,11 +42,11 @@ } .desktop-menu-open .nav-toggle { - .icon:first-child { + .icon:first-of-type { display: none; } - .icon:last-child { + .icon:last-of-type { display: block; } } diff --git a/assets/components/atoms/nav-toggle/nav-toggle.twig b/assets/components/atoms/nav-toggle/nav-toggle.twig index 94d1f4e25..95b217451 100644 --- a/assets/components/atoms/nav-toggle/nav-toggle.twig +++ b/assets/components/atoms/nav-toggle/nav-toggle.twig @@ -1,4 +1,5 @@
From 443f262ec259a4280f1625d582019ea126d5df1b Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Fri, 24 Aug 2018 16:20:22 +0200 Subject: [PATCH 32/46] =?UTF-8?q?=F0=9F=90=9B=20small=20keynumbers=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/components/molecules/key-number/key-number.twig | 2 +- .../organisms/key-number-group/key-number-group.scss | 9 ++++++--- .../organisms/key-number-group/key-number-group.twig | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/assets/components/molecules/key-number/key-number.twig b/assets/components/molecules/key-number/key-number.twig index c1ee6a5eb..da68d9c71 100644 --- a/assets/components/molecules/key-number/key-number.twig +++ b/assets/components/molecules/key-number/key-number.twig @@ -2,7 +2,7 @@
-
Étudiants
+

Étudiants

diff --git a/assets/components/organisms/key-number-group/key-number-group.scss b/assets/components/organisms/key-number-group/key-number-group.scss index 54704b3bc..609e13515 100644 --- a/assets/components/organisms/key-number-group/key-number-group.scss +++ b/assets/components/organisms/key-number-group/key-number-group.scss @@ -11,8 +11,8 @@ } @include media-breakpoint-up(md) { - .key-number { - flex: 1 0 50%; + .key-number { + flex: 1 0 50%; } } @@ -25,4 +25,7 @@ flex: 0 0 50%; } } -} \ No newline at end of file +} + +@include ie11('.key-number-group .key-number') { flex: 0 0 20%; } +@include ie11('.key-number-group .key-large') { flex: 0 0 45%; } diff --git a/assets/components/organisms/key-number-group/key-number-group.twig b/assets/components/organisms/key-number-group/key-number-group.twig index d7bbd18ba..b39fba18b 100644 --- a/assets/components/organisms/key-number-group/key-number-group.twig +++ b/assets/components/organisms/key-number-group/key-number-group.twig @@ -7,4 +7,4 @@ {% include '@molecules/key-number/key-number-large.twig' %} {% include '@molecules/key-number/key-number.twig' %}
-
\ No newline at end of file +
From cf1ecf89452449427a9cb0bc9102160803aa9e30 Mon Sep 17 00:00:00 2001 From: knuch Date: Mon, 27 Aug 2018 11:43:45 +0200 Subject: [PATCH 33/46] centralise z-index management. cleanup dead code --- .../components/atoms/nav-lang/nav-lang.scss | 2 +- .../atoms/nav-toggle/nav-toggle.scss | 2 +- assets/components/atoms/select/select.scss | 2 +- .../molecules/access-nav/access-nav.scss | 2 +- .../components/molecules/gallery/gallery.scss | 2 +- .../components/organisms/nav-main/nav-main.js | 6 -- .../organisms/nav-main/nav-main.scss | 56 +------------------ assets/config/bootstrap-variables.scss | 6 ++ 8 files changed, 13 insertions(+), 65 deletions(-) diff --git a/assets/components/atoms/nav-lang/nav-lang.scss b/assets/components/atoms/nav-lang/nav-lang.scss index fe221dccb..93eea8a90 100644 --- a/assets/components/atoms/nav-lang/nav-lang.scss +++ b/assets/components/atoms/nav-lang/nav-lang.scss @@ -68,7 +68,7 @@ bottom: -$mm-lang-height; width: $mm-lang-width; height: $mm-lang-height; - z-index: 999120; + z-index: $zindex-mobile-lang; background: gray('600'); transition: bottom 0.3s; diff --git a/assets/components/atoms/nav-toggle/nav-toggle.scss b/assets/components/atoms/nav-toggle/nav-toggle.scss index b80c4ddf3..41ee57c82 100644 --- a/assets/components/atoms/nav-toggle/nav-toggle.scss +++ b/assets/components/atoms/nav-toggle/nav-toggle.scss @@ -4,7 +4,7 @@ display: none; position: relative; top: 1px; - z-index: 101; + z-index: $zindex-toggle; margin-right: $grid-gutter-width / 3; padding: $spacer / 4 $spacer / 2; &:hover { cursor: pointer; } diff --git a/assets/components/atoms/select/select.scss b/assets/components/atoms/select/select.scss index 1a617bc39..1aedca17b 100644 --- a/assets/components/atoms/select/select.scss +++ b/assets/components/atoms/select/select.scss @@ -67,7 +67,7 @@ overflow: hidden; margin-top: -$dropdown-border-width; padding: $dropdown-padding-y 0; - z-index: 1000; + z-index: $zindex-dropdown; background: $dropdown-bg; border: $dropdown-border-width solid $dropdown-border-color; color: $dropdown-link-color; diff --git a/assets/components/molecules/access-nav/access-nav.scss b/assets/components/molecules/access-nav/access-nav.scss index f78e1902c..d7ebee13a 100644 --- a/assets/components/molecules/access-nav/access-nav.scss +++ b/assets/components/molecules/access-nav/access-nav.scss @@ -16,7 +16,7 @@ position: fixed; top: 0; left: 25px; - z-index: 3003; + z-index: $zindex-access-nav; transform: translateY(-100%); transition: opacity 0.2s, diff --git a/assets/components/molecules/gallery/gallery.scss b/assets/components/molecules/gallery/gallery.scss index c50102337..e38ff60cb 100644 --- a/assets/components/molecules/gallery/gallery.scss +++ b/assets/components/molecules/gallery/gallery.scss @@ -4,7 +4,7 @@ $gallery-btn-size: 41px; $gallery-btn-margin: 14px; .gallery.is-fullscreen { - z-index: 9999999; + z-index: $zindex-gallery-opened !important; /* eslint disable line */ } .gallery, diff --git a/assets/components/organisms/nav-main/nav-main.js b/assets/components/organisms/nav-main/nav-main.js index c5eac0d74..3c0cdf878 100644 --- a/assets/components/organisms/nav-main/nav-main.js +++ b/assets/components/organisms/nav-main/nav-main.js @@ -70,12 +70,6 @@ const nav = () => { toggleMobileMenu(); }); - // close toggle navigation - $('.nav-close').on('click', (e) => { - e.preventDefault(); - toggleDesktopMenu(); - }); - // Bind aciton to close toggle navigation, when clicking the white overlay $('.overlay').on('click', (e) => { e.preventDefault(); diff --git a/assets/components/organisms/nav-main/nav-main.scss b/assets/components/organisms/nav-main/nav-main.scss index 25bfe5d8d..3cf6ea185 100644 --- a/assets/components/organisms/nav-main/nav-main.scss +++ b/assets/components/organisms/nav-main/nav-main.scss @@ -8,7 +8,7 @@ $nav-spacer: 4px; .nav-main { position: relative; background: color('white'); - z-index: 100; + z-index: $zindex-nav; transition: left 0.3s; border-right: 1px solid gray('100'); @@ -199,54 +199,6 @@ a.nav-arrow { padding-left: 100%; } -// -// Close button for toggle menu -// -.nav-close { - display: none; - z-index: 999; - position: absolute; - top: $spacer / 2; - right: -1 * $spacer; - width: 35px; - height: 35px; - border-radius: 50%; - background: $white; - padding-left: 9px; - border: 1px solid gray('200'); - cursor: pointer; - transition: all 0.2s; - - &:hover { - background: gray('200'); - - &:before, - &:after { - background: $black; - } - } - - &:before, - &:after { - content: ' '; - display: block; - position: absolute; - top: 0.95 * $spacer; - width: 16px; - height: 2px; - background: gray('600'); - border-radius: 2px; - } - - &:before { - transform: rotate(45deg); - } - - &:after { - transform: rotate(-45deg); - } -} - // // Desktop // @@ -287,10 +239,6 @@ a.nav-arrow { position: relative; } - .nav-close { - display: block; - } - .nav-aside-wrapper { display: none; } @@ -412,7 +360,7 @@ a.nav-arrow { height: 0; overflow: hidden; cursor: pointer; - z-index: 50; + z-index: $zindex-nav-overlay; opacity: 0; background: $white; transition: opacity 0.3s; diff --git a/assets/config/bootstrap-variables.scss b/assets/config/bootstrap-variables.scss index e165c8aa3..b404cf9be 100644 --- a/assets/config/bootstrap-variables.scss +++ b/assets/config/bootstrap-variables.scss @@ -548,6 +548,12 @@ $zindex-modal-backdrop: 1040 !default; $zindex-modal: 1050 !default; $zindex-popover: 1060 !default; $zindex-tooltip: 1070 !default; +$zindex-nav-overlay: 1100 !default; +$zindex-nav: 1110 !default; +$zindex-toggle: 1120 !default; +$zindex-gallery-opened: 1120 !default; +$zindex-mobile-lang: 1140 !default; +$zindex-access-nav: 3003 !default; // Navs From aac697ac9e0553743086cc415f8b953c19af4302 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 27 Aug 2018 15:14:53 +0200 Subject: [PATCH 34/46] <2728> add function async loading toggle #213 --- .../atoms/nav-toggle/nav-toggle-async.twig | 6 ++++ .../atoms/nav-toggle/nav-toggle.yml | 10 ++++-- .../components/organisms/nav-main/nav-main.js | 33 ++++++++++++++----- 3 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 assets/components/atoms/nav-toggle/nav-toggle-async.twig diff --git a/assets/components/atoms/nav-toggle/nav-toggle-async.twig b/assets/components/atoms/nav-toggle/nav-toggle-async.twig new file mode 100644 index 000000000..82b9eddd3 --- /dev/null +++ b/assets/components/atoms/nav-toggle/nav-toggle-async.twig @@ -0,0 +1,6 @@ + diff --git a/assets/components/atoms/nav-toggle/nav-toggle.yml b/assets/components/atoms/nav-toggle/nav-toggle.yml index e271c065b..067629f3b 100644 --- a/assets/components/atoms/nav-toggle/nav-toggle.yml +++ b/assets/components/atoms/nav-toggle/nav-toggle.yml @@ -1,4 +1,10 @@ title: Nav toggle name: nav-toggle -notes: | - If you want a transitioning loading state, you can apply `is-loading` class on the component during the loading, but don't forget to remove it when it's loaded. +variants: + - name: async + title: Async + notes: > + If you want an asynchronous transition, you can apply `nav-toggle-async` class on + the component. **It will start the loading** state `onClick` instead of opening the navigation. +

+ When your content is ready, **you need to trigger the end of the loading** state using `$('#nav-toggle').trigger('loadend');` diff --git a/assets/components/organisms/nav-main/nav-main.js b/assets/components/organisms/nav-main/nav-main.js index 3c0cdf878..18d28d7b2 100644 --- a/assets/components/organisms/nav-main/nav-main.js +++ b/assets/components/organisms/nav-main/nav-main.js @@ -19,10 +19,16 @@ const nav = () => { // Open or close desktop toggle navigation, keeping it's atual position. // Used for the hamburger desktop menu to display current position - const toggleDesktopMenu = (offset = 0) => { + const toggleDesktopMenu = (mustOpen = false) => { + const navToggle = $('#nav-toggle'); + navToggle.toggleClass('open'); + const offsetX = navToggle.offset().left + navToggle.outerWidth(true); + const offsetY = navToggle.offset().top - $(window).scrollTop(); + $('.nav-main').css('top', offsetY); + $('body').toggleClass('desktop-menu-open'); - if (offset > 0 && $('body').hasClass('desktop-menu-open')) { - $('.nav-main').css('left', offset); + if (mustOpen && $('body').hasClass('desktop-menu-open')) { + $('.nav-main').css('left', offsetX); } else { $('.nav-main').css('left', ''); } @@ -79,11 +85,22 @@ const nav = () => { // Bind action to the desktop hamburger (next to breadcrumbs) // eslint-disable-next-line $('#nav-toggle').on('click', function() { - $(this).toggleClass('open'); - const offsetX = $(this).offset().left + $(this).outerWidth(true); - const offsetY = $(this).offset().top - $(window).scrollTop(); - $('.nav-main').css('top', offsetY); - toggleDesktopMenu(offsetX); + if ($(this).hasClass('nav-toggle-async') && !$(this).hasClass('open')) { + $(this).addClass('is-loading'); + + // Demo of loading resolution + if ($('#styleguide').length > 0) { + setTimeout(() => $('#nav-toggle').trigger('loadend'), 2000); + } + } else { + toggleDesktopMenu(true); + } + }); + + // eslint-disable-next-line + $('#nav-toggle').on('loadend', function() { + $(this).removeClass('is-loading'); + toggleDesktopMenu(true); }); }; From 389c4b2b53c4eece8cbf4005535e6d078128e4fd Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 27 Aug 2018 15:14:53 +0200 Subject: [PATCH 35/46] =?UTF-8?q?=E2=9C=A8=20add=20function=20async=20load?= =?UTF-8?q?ing=20toggle=20#213?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atoms/nav-toggle/nav-toggle-async.twig | 6 ++++ .../atoms/nav-toggle/nav-toggle.yml | 10 ++++-- .../components/organisms/nav-main/nav-main.js | 33 ++++++++++++++----- 3 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 assets/components/atoms/nav-toggle/nav-toggle-async.twig diff --git a/assets/components/atoms/nav-toggle/nav-toggle-async.twig b/assets/components/atoms/nav-toggle/nav-toggle-async.twig new file mode 100644 index 000000000..82b9eddd3 --- /dev/null +++ b/assets/components/atoms/nav-toggle/nav-toggle-async.twig @@ -0,0 +1,6 @@ + diff --git a/assets/components/atoms/nav-toggle/nav-toggle.yml b/assets/components/atoms/nav-toggle/nav-toggle.yml index e271c065b..067629f3b 100644 --- a/assets/components/atoms/nav-toggle/nav-toggle.yml +++ b/assets/components/atoms/nav-toggle/nav-toggle.yml @@ -1,4 +1,10 @@ title: Nav toggle name: nav-toggle -notes: | - If you want a transitioning loading state, you can apply `is-loading` class on the component during the loading, but don't forget to remove it when it's loaded. +variants: + - name: async + title: Async + notes: > + If you want an asynchronous transition, you can apply `nav-toggle-async` class on + the component. **It will start the loading** state `onClick` instead of opening the navigation. +

+ When your content is ready, **you need to trigger the end of the loading** state using `$('#nav-toggle').trigger('loadend');` diff --git a/assets/components/organisms/nav-main/nav-main.js b/assets/components/organisms/nav-main/nav-main.js index 3c0cdf878..18d28d7b2 100644 --- a/assets/components/organisms/nav-main/nav-main.js +++ b/assets/components/organisms/nav-main/nav-main.js @@ -19,10 +19,16 @@ const nav = () => { // Open or close desktop toggle navigation, keeping it's atual position. // Used for the hamburger desktop menu to display current position - const toggleDesktopMenu = (offset = 0) => { + const toggleDesktopMenu = (mustOpen = false) => { + const navToggle = $('#nav-toggle'); + navToggle.toggleClass('open'); + const offsetX = navToggle.offset().left + navToggle.outerWidth(true); + const offsetY = navToggle.offset().top - $(window).scrollTop(); + $('.nav-main').css('top', offsetY); + $('body').toggleClass('desktop-menu-open'); - if (offset > 0 && $('body').hasClass('desktop-menu-open')) { - $('.nav-main').css('left', offset); + if (mustOpen && $('body').hasClass('desktop-menu-open')) { + $('.nav-main').css('left', offsetX); } else { $('.nav-main').css('left', ''); } @@ -79,11 +85,22 @@ const nav = () => { // Bind action to the desktop hamburger (next to breadcrumbs) // eslint-disable-next-line $('#nav-toggle').on('click', function() { - $(this).toggleClass('open'); - const offsetX = $(this).offset().left + $(this).outerWidth(true); - const offsetY = $(this).offset().top - $(window).scrollTop(); - $('.nav-main').css('top', offsetY); - toggleDesktopMenu(offsetX); + if ($(this).hasClass('nav-toggle-async') && !$(this).hasClass('open')) { + $(this).addClass('is-loading'); + + // Demo of loading resolution + if ($('#styleguide').length > 0) { + setTimeout(() => $('#nav-toggle').trigger('loadend'), 2000); + } + } else { + toggleDesktopMenu(true); + } + }); + + // eslint-disable-next-line + $('#nav-toggle').on('loadend', function() { + $(this).removeClass('is-loading'); + toggleDesktopMenu(true); }); }; From c8207432a4a30a7cdd95e745633ac8d90f39a6bd Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 15:19:35 +0200 Subject: [PATCH 36/46] Remove unpurpose added class #265 --- .../components/pages/event-detail/event-detail.twig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/components/pages/event-detail/event-detail.twig b/assets/components/pages/event-detail/event-detail.twig index 68fea8cf5..6d541d4c7 100644 --- a/assets/components/pages/event-detail/event-detail.twig +++ b/assets/components/pages/event-detail/event-detail.twig @@ -14,12 +14,12 @@ {% block content %} -
+
-

Event title may contains several words on maybe multiple lines, who knows?

+

Event title may contains several words on maybe multiple lines, who knows?

@@ -34,7 +34,7 @@ Date - + 13.01.2018 - 12:00 → 13:30 @@ -46,9 +46,9 @@ Lieu -
+
SV 2811 -
+
EPFL
Lausanne, 1015 @@ -64,7 +64,7 @@ Prix -
Accès libre
+
Accès libre
From bb3c5849032fca00332eadd8ea3de7a884144c58 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 15:26:07 +0200 Subject: [PATCH 37/46] Add itemscope and remove unused class copied from exemples #265 --- .../content-types/event/event-listing.twig | 13 ++++++++----- assets/components/content-types/event/event.twig | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/assets/components/content-types/event/event-listing.twig b/assets/components/content-types/event/event-listing.twig index dab645a9e..0b4b5df1b 100644 --- a/assets/components/content-types/event/event-listing.twig +++ b/assets/components/content-types/event/event-listing.twig @@ -1,20 +1,23 @@
{% for i in 1..5 %} - +
{% include '@atoms/picture/picture.twig' with {'variant':'news-thumb'} %}
-

Startup Acceleration Workshops

+

Startup Acceleration Workshops

{% block date %} - 10.01.2018 + 10.01.2018 13:00 17:30 {% endblock %} -

- {% block info %}Lieu : ArtLab EPFL
Catégorie : Événements culturel
{% endblock %} +

+ {% block info %} + Lieu : ArtLab EPFL +
Catégorie : Événements culturel
+ {% endblock %}

diff --git a/assets/components/content-types/event/event.twig b/assets/components/content-types/event/event.twig index eacd07d16..fcd7ffb97 100644 --- a/assets/components/content-types/event/event.twig +++ b/assets/components/content-types/event/event.twig @@ -1,4 +1,4 @@ - +
{% block img -%} @@ -10,12 +10,15 @@ {% block summary %}{% endblock -%}
{% block date %} - 10.01.2018 + 10.01.2018 13:00 17:30 {% endblock %} -

- {% block info %}Lieu : ArtLab EPFL
Catégorie : Événements culturel
{% endblock %} +

+ {% block info %} + Lieu : ArtLab EPFL +
Catégorie : Événements culturel + {% endblock %}

From c498723c78b2dd824db55a350f52737f59218df0 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 15:32:29 +0200 Subject: [PATCH 38/46] Add content to datePublished #265 --- .../components/content-types/news/news-basic-teaser.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/components/content-types/news/news-basic-teaser.twig b/assets/components/content-types/news/news-basic-teaser.twig index 5d8aadb10..bb1faabc2 100644 --- a/assets/components/content-types/news/news-basic-teaser.twig +++ b/assets/components/content-types/news/news-basic-teaser.twig @@ -1,15 +1,15 @@ - + {% block img %} a portrait of professor Xile Hu {% endblock %} -
+

News title

- + Recherche - Prix et récompenses + Prix et récompenses

The EPFL favors closer ties to industry leading research in order to best meet the scientific, technological and societal

From 2b408c24fb6549e7e2fa8032d31eb0d70a53bbb3 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 15:36:06 +0200 Subject: [PATCH 39/46] remove prettylink because of grey bg #265 --- assets/components/organisms/contact/contact-banner.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/components/organisms/contact/contact-banner.twig b/assets/components/organisms/contact/contact-banner.twig index 609b8c5ae..842bcf50e 100644 --- a/assets/components/organisms/contact/contact-banner.twig +++ b/assets/components/organisms/contact/contact-banner.twig @@ -11,7 +11,7 @@
›

- services.etudiants@epfl.ch + services.etudiants@epfl.ch

From eabefc419468f4c8717e0eaf0bf9a6e410561326 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 15:40:38 +0200 Subject: [PATCH 40/46] Remove mt-5 and therefor margin between blocks with bg-gray-100 #265 --- assets/components/pages/about/about.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/components/pages/about/about.twig b/assets/components/pages/about/about.twig index e7476a9e4..23e1e8c03 100644 --- a/assets/components/pages/about/about.twig +++ b/assets/components/pages/about/about.twig @@ -39,7 +39,7 @@ {% include '@content-types/news/news-latest-two.twig' %}

-
+
@@ -55,7 +55,7 @@
-
+

The next events

@@ -64,7 +64,7 @@
-
+
From f38fe556f4fcc40953e41f7c9b7626b4218f5e69 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 15:42:17 +0200 Subject: [PATCH 41/46] Add @todo quote for #159 and #265 --- assets/components/pages/about/about.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/components/pages/about/about.twig b/assets/components/pages/about/about.twig index 23e1e8c03..0618e4e1c 100644 --- a/assets/components/pages/about/about.twig +++ b/assets/components/pages/about/about.twig @@ -80,7 +80,7 @@
- Quote +
{% include '@content-types/basic-page/basic-page.twig' %} From c96ec1826fd4e78c05fc308a28411cdd102e4049 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 27 Aug 2018 15:49:05 +0200 Subject: [PATCH 42/46] =?UTF-8?q?=F0=9F=93=9D=20add=20better=20release=20d?= =?UTF-8?q?ocumentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 101584c3d..7aee9d710 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,42 @@ With Docker, you can run: - `$ docker-compose up builder` same as `$ yarn build` but in containers - `$ docker-compose up server` same as `$ yarn start` but in containers -## Publish +## Create a new release + +#### 1. Git release + +This project follows the [git-flow](https://danielkummer.github.io/git-flow-cheatsheet/)'s guidelines. It means you must use the following command to start a new release from your local **`dev`** branch : + +```bash +$ git flow release start x.x.x +``` + +#### 2. Changelog & versions + +Because a new release can impact a lot of projects who use *Element*, **you must precisely list\* all the updates made on the components markup** in the **`CHANGELOG.md`**. + +**Check previous versions to give you an idea of how to write it the right way* + +Then, don't forget to **update the version number** in the `VERSION` and the `package.json` files. + +Commit everything ! + +#### 3. Complete the release + +First, you must complete the [git-flow](https://danielkummer.github.io/git-flow-cheatsheet/) release process with the following command : + +```bash +$ git flow release finish -p 'x.x.x' +``` + +Complete every commit and tag message if needed. Then put yourself in your local **`master`** branch and type the following command to **start the build publishing task** : + +```bash +$ sh publish.sh x.x.x +``` + +That's it ! If everything went fine, **the new release's build is available on the `dist/frontend`** branch thanks to you ! -1. From your local `dev` branch, `$ git flow release start x.x.x` -2. Update `VERSION`, `CHANGELOG.md` and package.json `version` -3. `$ git flow release finish -p 'x.x.x'` -4. From your local `master` branch, `$ sh publish.sh x.x.x` ## Contribute From 378d861e718ee74c1e6c09fc959c93fe9f2c9c63 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 27 Aug 2018 15:55:28 +0200 Subject: [PATCH 43/46] =?UTF-8?q?=F0=9F=93=9D=20add=20release=20doc=20proc?= =?UTF-8?q?ess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7aee9d710..9d78e40d9 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,10 @@ First, you must complete the [git-flow](https://danielkummer.github.io/git-flow- $ git flow release finish -p 'x.x.x' ``` +Because the previous command will normally push your release commits and tag, simply **go on Github\* and copy/paste the release's changelog content** in the release's description. (go directly using `https://github.com/epfl-idevelop/elements/releases/edit/x.x.x`) + +#### 4. Publish the builds + Complete every commit and tag message if needed. Then put yourself in your local **`master`** branch and type the following command to **start the build publishing task** : ```bash From 3145dad9225f90f7493ca7018c8b21fb2612bd4a Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 16:29:30 +0200 Subject: [PATCH 44/46] Add extra information to contact banner #265 --- assets/components/organisms/contact/contact.yml | 10 +++++++++- .../association-homepage/association-homepage.twig | 3 +-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/assets/components/organisms/contact/contact.yml b/assets/components/organisms/contact/contact.yml index 617463bc7..7f2f58485 100644 --- a/assets/components/organisms/contact/contact.yml +++ b/assets/components/organisms/contact/contact.yml @@ -5,6 +5,14 @@ variants: title: Contact bloc compact - name: banner title: Banner - wrapper: bg-gray-100 + notes: | + You can use contact Banner inside a grey wrapper as + ``` +
+
+ ... +
+
+ ``` notes: | ### Contact bloc diff --git a/assets/components/pages/association-homepage/association-homepage.twig b/assets/components/pages/association-homepage/association-homepage.twig index bb78f1889..b4d30a970 100644 --- a/assets/components/pages/association-homepage/association-homepage.twig +++ b/assets/components/pages/association-homepage/association-homepage.twig @@ -48,9 +48,8 @@ {% include '@organisms/social-feed-group/social-feed-group.twig' %}
-
-
+
{% include '@organisms/contact/contact-banner.twig' %}
{% endblock %} From 3357c7a9607302a27c6abc44f289289b8ee9bbe2 Mon Sep 17 00:00:00 2001 From: Marc Friederich Date: Mon, 27 Aug 2018 16:34:00 +0200 Subject: [PATCH 45/46] Remove classes #265 --- assets/components/content-types/event/event.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/components/content-types/event/event.twig b/assets/components/content-types/event/event.twig index fcd7ffb97..05d52e440 100644 --- a/assets/components/content-types/event/event.twig +++ b/assets/components/content-types/event/event.twig @@ -6,13 +6,13 @@ {% endblock %} -

{% block title %}Startup Acceleration Workshops{% endblock %}

+

{% block title %}Startup Acceleration Workshops{% endblock %}

{% block summary %}{% endblock -%}
{% block date %} 10.01.2018 - 13:00 - 17:30 + 13:00 + 17:30 {% endblock %}

{% block info %} From 4535b39f947c6ba3d9476aaa754acbf63302d071 Mon Sep 17 00:00:00 2001 From: Yann Gouffon Date: Mon, 27 Aug 2018 17:13:21 +0200 Subject: [PATCH 46/46] =?UTF-8?q?=F0=9F=94=96=20bump=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- package.json | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 925177a35..131a675df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,50 @@ # CHANGELOG +*1.2.0* (2018-08-27) + - ⚠️ breaking markup changes + - **Organisms** : + - **[footer light:](https://epfl-idevelop.github.io/elements/#/organisms/footer)** margin improvement + - **[Contact & variants](https://epfl-idevelop.github.io/elements/#/organisms/contact):** Add schema attributes and refactor default background + - **Content-type** : + - **[science question:](https://epfl-idevelop.github.io/elements/#/content-types/science-question)** New design + - **[bachelor project](https://epfl-idevelop.github.io/elements/#/content-types/bachelor-project):** refactor bachelor-project content-type + - **[event & variants](https://epfl-idevelop.github.io/elements/#/content-types/event):** Add schema attributes + - **[news & variants](https://epfl-idevelop.github.io/elements/#/content-types/news):** Add schema attributes + - **Pages** : + - **[Association homepage](https://epfl-idevelop.github.io/elements/#/pages/association-homepage):** Update footer for the light variant + - **[Blog homepage](https://epfl-idevelop.github.io/elements/#/pages/blog-homepage):** Update footer for the light variant + - **[Event detail page](https://epfl-idevelop.github.io/elements/#/pages/event-detail):** Overhaul of the header and the content + - **[Event homepage](https://epfl-idevelop.github.io/elements/#/pages/event-homepage):** Update footer for the light variant + - **[Faculties page](https://epfl-idevelop.github.io/elements/#/pages/facultes):** Update the side navigation content + - **[Lab homepage](https://epfl-idevelop.github.io/elements/#/pages/lab-homepage):** Update the usage of the contact organism + - **[News detail page](https://epfl-idevelop.github.io/elements/#/pages/news-detail):** Add schema attributes + - **[News homepage](https://epfl-idevelop.github.io/elements/#/pages/news-homepage):** Update pagination wrapper + - **[People list page](https://epfl-idevelop.github.io/elements/#/pages/people-list):** Update the header and breadcrumb + + - ✨ New implementations + - add function for async loading toggle + - add better release documentation and process + - **Atoms** : + - add **[loader](https://epfl-idevelop.github.io/elements/#/atoms/loader)** and [browse button async state](https://epfl-idevelop.github.io/elements/#/atoms/nav-toggle) + - **Molecules** : + - **[Key number](https://epfl-idevelop.github.io/elements/#/molecules/key-number)** + - **Organisms** : + - **[Key numbers group](https://epfl-idevelop.github.io/elements/#/organisms/key-number-group)** + - **Content-types** : + - **[Study plan](https://epfl-idevelop.github.io/elements/#/content-types/study-plan)** content type + - **Pages** : + - add **[about](https://epfl-idevelop.github.io/elements/#/pages/about)** page + - add **[education](https://epfl-idevelop.github.io/elements/#/pages/education)** page + - add **[innovation](https://epfl-idevelop.github.io/elements/#/pages/innovation)** page + + - 🛠 Fixes & other + - error messages cleaning + - fix missing round option on social-icon variant + - add default profile picture for people details page #182 + - fix IE grid issue with minmax and sizes + - centralise z-index management. cleanup dead code + *1.1.2* (2018-08-20) - Add documentation new structure - Add branding pages diff --git a/VERSION b/VERSION index 45a1b3f44..26aaba0e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.2 +1.2.0 diff --git a/package.json b/package.json index a8dcf4864..e7a9c67cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "epfl-elements", - "version": "1.1.2", + "version": "1.2.0", "license": "MIT", "main": "index.html", "repository": {