diff --git a/assets/components/atoms/button/button.scss b/assets/components/atoms/button/button.scss index 30c4949f4..5798938a7 100644 --- a/assets/components/atoms/button/button.scss +++ b/assets/components/atoms/button/button.scss @@ -53,6 +53,7 @@ .btn-secondary { background: transparent; border-color: $gray-300; + font-size: .8125rem; .bg-dark & { border-color: $gray-600; diff --git a/assets/components/atoms/collapse/collapse-partial.twig b/assets/components/atoms/collapse/collapse-partial.twig index 7b2fd4c41..7ebb1b51e 100644 --- a/assets/components/atoms/collapse/collapse-partial.twig +++ b/assets/components/atoms/collapse/collapse-partial.twig @@ -1,5 +1,10 @@ + +
+ +
+
+

+ EPFL PRES
+ + CE 3 316 (Centre Est)
+ Station 1
+ CH-1015 Lausanne +
+

+
+
+

+ +41 21 666 77 88 + Bureau principal: INN 019 +
+ +41 21 666 55 66 + Bureau: INN 018 +
+ Unité: EPFLSISI-EXOPEXAPP +

+
+ +
+ +
+ + + +
+ +
+
+

+ EPFL PRES
+ + CE 3 316 (Centre Est)
+ Station 1
+ CH-1015 Lausanne +
+

+
+
+

+ +41 21 666 77 88 + Bureau principal: INN 019 +
+ Unité: EPFLSISI-EXOPEXAPP +

+
+
+

Web site: https://rh.epfl.ch/

+
+
+ +
+ + + +
+ +
+
+

+ EPFL PRES
+ + CE 3 316 (Centre Est)
+ Station 1
+ CH-1015 Lausanne +
+

+
+
+

+ +41 21 666 77 88 + Bureau principal: INN 019 +
+ +41 21 666 55 66 + Bureau: INN 018 +
+ Unité: EPFLSISI-EXOPEXAPP +

+
+
+ +
\ No newline at end of file diff --git a/assets/components/molecules/collapse-group/collapse-group.yml b/assets/components/molecules/collapse-group/collapse-group.yml index 01484163c..8895df224 100644 --- a/assets/components/molecules/collapse-group/collapse-group.yml +++ b/assets/components/molecules/collapse-group/collapse-group.yml @@ -3,6 +3,10 @@ name: collapse-group variants: - name: rich-content title: Collapse with rich content + - name: people-contacts + title: Collapse with contact info + notes: | + Used in People pages notes: |
diff --git a/assets/components/molecules/list-group/list-group-infoscience.twig b/assets/components/molecules/list-group/list-group-infoscience.twig new file mode 100644 index 000000000..b2b4739c6 --- /dev/null +++ b/assets/components/molecules/list-group/list-group-infoscience.twig @@ -0,0 +1,32 @@ +
+ {% for i in 1..3 %} +
+
+

Noms des auteurs: Titre de la publication lorem ipsum dolor sit amet consectetur adipscing elit; Sous-titre lorem ipsum dolor sit amet consectetur adipscing elit; Références, lieu de publication, etc.

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

Noms des auteurs: Titre de la publication lorem ipsum dolor sit amet consectetur adipscing elit; Sous-titre lorem ipsum dolor sit amet consectetur adipscing elit; Références, lieu de publication, etc.

+
+ +
+
+
diff --git a/assets/components/molecules/list-group/list-group.scss b/assets/components/molecules/list-group/list-group.scss index a896420e4..5d6dab276 100644 --- a/assets/components/molecules/list-group/list-group.scss +++ b/assets/components/molecules/list-group/list-group.scss @@ -1,5 +1,14 @@ @charset 'utf-8'; +.list-group-item { + padding-top: 1.25rem; + padding-bottom: 1.25rem; + + p:last-child { + margin-bottom: 0; + } +} + .list-group-item-borderless { padding-right: 0; padding-left: 0; @@ -14,6 +23,7 @@ } .list-group { + .list-group-teaser { display: block; text-decoration: none; @@ -29,7 +39,7 @@ } } - .list-group-teaser-thumbnail { + .list-group-teaser-thumbnail{ flex: 0 0 12rem; padding: 1rem; padding-top: 1rem; @@ -106,4 +116,37 @@ border: 1px solid $black !important; } } + + .item-metadata { + + p { + display: inline-block; + margin-bottom: 0; + } + + .item-date { + font-size: 1rem; + font-weight: bold; + margin-right: 0.5em; + } + } +} + +.list-group-item-infoscience { + + &.has-thumbnail { + display: flex; + + .list-group-thumbnail{ + flex: 0 0 8rem; + margin-right: 1rem; + z-index: $zindex-1; + } + + .list-group-content { + flex: 0 1 100%; + z-index: $zindex-1; + } + + } } diff --git a/assets/components/molecules/list-group/list-group.yml b/assets/components/molecules/list-group/list-group.yml index 73c1666be..7ac59aad7 100644 --- a/assets/components/molecules/list-group/list-group.yml +++ b/assets/components/molecules/list-group/list-group.yml @@ -11,6 +11,10 @@ variants: The Borderless variant. background: '' wrapper: '' + - name: infoscience + title: Infoscience + notes: | + List of Infoscience publications. - name: teasers title: Teasers notes: | diff --git a/assets/components/pages/people-detail/people-detail.scss b/assets/components/pages/people-detail/people-detail.scss new file mode 100644 index 000000000..da58c88f7 --- /dev/null +++ b/assets/components/pages/people-detail/people-detail.scss @@ -0,0 +1,50 @@ +@charset 'utf-8'; + +.people-title { + font-size: 1.75rem; + font-weight: 700; +} + +.people-basic-info { + flex-direction: row-reverse; +} + +.people-contacts { + + hr { + border-color: $gray-300; + margin: 0; + } +} + +.list-group + h3 { + margin-top: 2em; +} + +.people-contents { + + .list-group { + + .list-group-item-borderless:not(.education-list):last-child { + border-bottom: 0; + margin-bottom: 0; + } + } +} + +.education-list { + display: grid; + grid-template-columns: minmax(20%,4fr) minmax(20%,3fr) minmax(20%,3fr) 8rem; + padding-top: .75rem; + padding-bottom: .75rem; + + p { + margin: 0; + padding-right: 1rem; + + &:last-child { + padding-right: 0; + text-align: right; + } + } +} \ No newline at end of file diff --git a/assets/components/pages/people-detail/people-detail.twig b/assets/components/pages/people-detail/people-detail.twig index adf526e9b..29ff6d9b2 100644 --- a/assets/components/pages/people-detail/people-detail.twig +++ b/assets/components/pages/people-detail/people-detail.twig @@ -41,66 +41,84 @@ {# Header area #}
-
+
-
+
{# Person avatar and buttons #}
-
+
+ - Avatar placeholder image + Avatar placeholder image
-

Habilitation Dr. Ing

+

- prenom.nom@epfl.ch - +41 21 666 77 88 - abbr.epfl.ch -

-
-
-

- {% include "@atoms/social-icon/social-icon-link.twig" with { - discrete: true, - icon: "icon-facebook" - } %} - {% include "@atoms/social-icon/social-icon-link.twig" with { - discrete: true, - icon: "icon-twitter" - } %} - {% include "@atoms/social-icon/social-icon-link.twig" with { - discrete: true, - icon: "icon-linkedin" - } %} + + Liste complète des adresses et fonctions +
+ {% include "@atoms/icon/icon.twig" with { icon: 'icon-lock' } %}Données administratives +

+
-
-
Disponibilités
+
+
+ +
+
+
+

Professeur titulaire, directeur du département XY

- Absente un vendredi sur deux. + prenom.nom@epfl.ch + +41 21 666 77 88 + abbr.epfl.ch

+

Nationalité: suisse et allemande

+
-
- -
{# Collapsible info #} - {% include '@molecules/collapse-group/collapse-group-rich-content.twig' with { title: false } %} - -

- - Liste complète des adresses et fonctions -
- {% include "@atoms/icon/icon.twig" with { icon: 'icon-lock' } %}Données administratives -
-

+ {% include '@molecules/collapse-group/collapse-group-people-contacts.twig' with { title: false } %} +
+
+
+

Informations complémentaires

+

Disponibilités: absente un vendredi sur deux.

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque auctor urna id nulla ornare, placerat gravida nulla tincidunt. Nullam scelerisque mauris neque. Quisque condimentum nisl dolor, id auctor lorem interdum non.

+
+
@@ -114,13 +132,13 @@ - -
+ +
{# Biography area #} -
-
-

Biographyof Xavier Alexandre

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

Biographie de Xavier Alexandre

+ +
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque auctor urna id nulla ornare, placerat gravida nulla tincidunt. Nullam scelerisque mauris neque. Quisque condimentum nisl dolor, id auctor lorem interdum non. Pellentesque ut ligula imperdiet, dictum risus eu, cursus eros. Curabitur elementum sapien nec velit egestas consequat. Ut fermentum dolor eu purus efficitur rutrum ac at purus. Curabitur eu risus vel leo vehicula auctor. Aenean in velit nisi. Curabitur ultricies lacinia odio, sed egestas ex facilisis nec. Pellentesque et sagittis justo, id consequat odio. Nullam molestie sit amet eros quis consequat.

+

Mission

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque auctor urna id nulla ornare, placerat gravida nulla tincidunt. Nullam scelerisque mauris neque. Quisque condimentum nisl dolor, id auctor lorem interdum non. Pellentesque ut ligula imperdiet, dictum risus eu, cursus eros.

+

Curabitur elementum sapien nec velit egestas consequat. Ut fermentum dolor eu purus efficitur rutrum ac at purus. Curabitur eu risus vel leo vehicula auctor. Aenean in velit nisi. Curabitur ultricies lacinia odio, sed egestas ex facilisis nec. Pellentesque et sagittis justo, id consequat odio. Nullam molestie sit amet eros quis consequat.

+

Travail en cours

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque auctor urna id nulla ornare, placerat gravida nulla tincidunt. Nullam scelerisque mauris neque. Quisque condimentum nisl dolor, id auctor lorem interdum non. Pellentesque ut ligula imperdiet, dictum risus eu, cursus eros. Curabitur elementum sapien nec velit egestas consequat. Ut fermentum dolor eu purus efficitur rutrum ac at purus.

-
-

Fields of expertisesof Xavier Alexandre

+
+

Champs de compétences

- Expertise - Expertise - Expertise - Expertise - Expertise - Expertise - Expertise - Expertise + Mot clé + Mot clé + Mot clé + Mot clé + Mot clé + Mot clé + Mot clé + Mot clé

+ {# Free content area #} +

architecture web, ergonomie, usability, ergonomie, design et architecture de l’information, cms, iconographie, graphisme web, charte graphique, design, logo, expertise communication web, html, css2, ui design

-
- - {# Publications #} -
-

Publicationsof Xavier Alexandre

- {% include '@molecules/list-group/list-group-borderless.twig' %} - -
- - {# Teaching and PHD area #} -
-

Teaching & PHDof Xavier Alexandre

-
-
-

Teaching

-
-
    -
  • Computer science
  • -
  • Communication systems
  • -
+
+

Formation

+
+
+

Dr. ès Sciences

+

Microtechnologie

+

Université de Neuchâtel

+

2001

+
+
+

Master in Applied Sciences

+

Engineering Physics

+

École Polytechnique de Montréal

+

1997

-
-

PhD Programs

-
-
    -
  • Lorem ipsum dolor sit amet, consectetur adipisicing elit. Harum, reiciendis!
  • -
  • Lorem ipsum dolor sit amet, consectetur.
  • -
  • Lorem ipsum dolor sit amet, consectetur adipisicing elit.
  • -
+
+
+

Parcours professionnel

+
+ {% for i in 1..3 %} +
+

Intitulé du poste

+

Description du poste, lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel tortor nulla. In vehicula ante vel turpis rhoncus, ut malesuada magna tincidunt. Pellentesque purus sapien, porta ut aliquet et, sagittis ut diam.

+
+ {% endfor %}
-
-

PhD Students

-
- {% include '@molecules/avatar-teaser/avatar-teaser.twig' %} - {% include '@molecules/avatar-teaser/avatar-teaser.twig' %} - {% include '@molecules/avatar-teaser/avatar-teaser.twig' %} +
+
+

Récompenses

+
+ {% for i in 1..4 %} +
+

Titre de la récompense

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel tortor nulla. In vehicula ante vel turpis rhoncus, ut malesuada magna tincidunt. Pellentesque purus sapien, porta ut aliquet et, sagittis ut diam.

+
+ {% endfor %}
- -
-

Coursesof Xavier Alexandre

- {% include '@molecules/tabs/tabs-vertical.twig' %} +
+ +
+ +
+ {# Publications #} +
+

Publications de Xavier Alexandre

+
+

Infoscience

+ {% include '@molecules/list-group/list-group-infoscience.twig' %} +
+
+

Autres publications

+ {% include '@molecules/list-group/list-group-infoscience.twig' %} +
+
+ +
+
+ {# Teaching and PHD area #} +
+

Enseignement of Xavier Alexandre

+
+

Matières enseignées

+

Informatique, Systèmes de communication, Architecture logiciels

+

Programmes doctoraux

+

Doctoral program in computer and communication science, Doctoral program in Electrical Engineering

+

Doctorant·es

+

Gwendoline Woodroff, Hurlu Berlu, Anne Hughes, Martin Richard-Foy

+

Ancien·nes doctorant·es

+

Gwendoline Woodroff, Hurlu Berlu, Anne Hughes, Martin Richard-Foy, Gwendoline Woodroff, Hurlu Berlu, Anne Hughes, Martin Richard-Foy, Gwendoline Woodroff, Hurlu Berlu, Anne Hughes, Martin Richard-Foy, Gwendoline Woodroff, Hurlu Berlu, Anne Hughes, Martin Richard-Foy, Gwendoline Woodroff, Hurlu Berlu, Anne Hughes, Martin Richard-Foy

+
+
+

Cours of Xavier Alexandre

+
+ {% for i in 1..3 %} +
+

Nom du cours

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vel tortor nulla. In vehicula ante vel turpis rhoncus, ut malesuada magna tincidunt. Pellentesque purus sapien, porta ut aliquet et, sagittis ut diam.

+
+ {% endfor %} +
+
+
+
+ +
+
+ {# Research area #}
-

Researchof Xavier Alexandre

- -

Topics

-

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -

- -

Ongoing Research Projects

-

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -

+

Recherche of Xavier Alexandre

+
+

Sujets

+

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+

Projets de recherche en cours

+

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +

+
-
+
{% endblock %} diff --git a/assets/components/site.scss b/assets/components/site.scss index 7a2a62746..f5b2d9ad6 100644 --- a/assets/components/site.scss +++ b/assets/components/site.scss @@ -38,7 +38,7 @@ body { & + h4, & + h5, & + h6 { - margin-top: 3rem; + margin-top: 1.5em; } } @@ -46,6 +46,6 @@ body { h3 + h4, h4 + h5, h5 + h6 { - margin-top: 3rem; + margin-top: 1.5em; } } \ No newline at end of file diff --git a/assets/config/typography.scss b/assets/config/typography.scss index 6b13d0db1..8eb9b6c11 100644 --- a/assets/config/typography.scss +++ b/assets/config/typography.scss @@ -23,7 +23,7 @@ h3, h4, h5, h6 { - margin-bottom: .75rem; + margin-bottom: .75em; } h1, diff --git a/assets/icons/google.svg b/assets/icons/google.svg new file mode 100644 index 000000000..014b5ceb9 --- /dev/null +++ b/assets/icons/google.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/portrait-placeholder.svg b/assets/svg/portrait-placeholder.svg new file mode 100644 index 000000000..cdc3719e5 --- /dev/null +++ b/assets/svg/portrait-placeholder.svg @@ -0,0 +1 @@ +portrait-placeholder \ No newline at end of file