-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into styleguide/new-epfl-icons
- Loading branch information
Showing
39 changed files
with
331 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| @charset "utf-8"; | ||
|
|
||
| .form-control { | ||
| border-color: $input-border-color; | ||
| height: auto; | ||
| transition: | ||
| color 0.3s, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <a class="btn btn-primary" href="#">Primary button link</a> | ||
| <a class="btn btn-secondary" href="#">Secondary button link</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
assets/components/content-types/news/news-horizontal-listing-gray.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <div class="card-slider-wrapper"> | ||
| <div class="card-slider"> | ||
| {% for i in 1..10 %} | ||
| <div class="card-slider-cell"> | ||
| <a href="#" class="card link-trapeze-horizontal"> | ||
| <div class="card-body"> | ||
| {% include '@atoms/picture/picture.twig' with {'variant':'news-thumb'} %} | ||
| <div itemscope itemtype="http://schema.org/Article"> | ||
| <h3 class="card-title h5 mt-3" itemprop="name">Physics: new e-books for the AIAA Education Series</h3> | ||
| <p> | ||
| <time datetime="2018-03-26" itemprop="datePublished"><span class="sr-only">Published:</span>26.03.2018</time> | ||
| <span class="text-muted" itemprop="description">— 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?</span> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </a> | ||
| </div> | ||
| {% endfor %} | ||
| </div> | ||
|
|
||
| <div class="card-slider-footer"> | ||
| <div> | ||
| <button role="button" id="card-slider-prev" class="card-slider-btn link-trapeze-horizontal disabled"> | ||
| <svg class="icon" aria-hidden="true"> | ||
| <use xlink:href="#icon-chevron-left"></use> | ||
| </svg> | ||
| </button> | ||
| <button role="button" id="card-slider-next" class="card-slider-btn link-trapeze-horizontal"> | ||
| <svg class="icon" aria-hidden="true"> | ||
| <use xlink:href="#icon-chevron-right"></use> | ||
| </svg> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> |
36 changes: 36 additions & 0 deletions
36
assets/components/content-types/news/news-horizontal-listing.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <div class="card-slider-wrapper"> | ||
| <div class="card-slider"> | ||
| {% for i in 1..10 %} | ||
| <div class="card-slider-cell"> | ||
| <a href="#" class="card card-gray link-trapeze-horizontal"> | ||
| <div class="card-body"> | ||
| {% include '@atoms/picture/picture.twig' with {'variant':'news-thumb'} %} | ||
| <div itemscope itemtype="http://schema.org/Article"> | ||
| <h3 class="card-title h5 mt-3" itemprop="name">Physics: new e-books for the AIAA Education Series</h3> | ||
| <p> | ||
| <time datetime="2018-03-26" itemprop="datePublished"><span class="sr-only">Published:</span>26.03.2018</time> | ||
| <span class="text-muted" itemprop="description">— 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?</span> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </a> | ||
| </div> | ||
| {% endfor %} | ||
| </div> | ||
|
|
||
| <div class="card-slider-footer"> | ||
| <div> | ||
| <button role="button" id="card-slider-prev" class="card-slider-btn link-trapeze-horizontal disabled"> | ||
| <svg class="icon" aria-hidden="true"> | ||
| <use xlink:href="#icon-chevron-left"></use> | ||
| </svg> | ||
| </button> | ||
| <button role="button" id="card-slider-next" class="card-slider-btn link-trapeze-horizontal"> | ||
| <svg class="icon" aria-hidden="true"> | ||
| <use xlink:href="#icon-chevron-right"></use> | ||
| </svg> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
assets/components/molecules/key-number/key-number-hn-link.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| {% set icon = icon|default("https://via.placeholder.com/") %} | ||
| <a class="card link-trapeze-horizontal" href="#"> | ||
| <div class="card border-0 bg-white m-0 h-100"> | ||
| <div class="card-header border-0"> | ||
| <div class="row"> | ||
| <div class="col-md-6"> | ||
| <p class="h4">près de 18'000</p> | ||
| </div> | ||
| <div class="col-md-6 text-right"> | ||
| <img src="images/styleguide/key-numbers/students.png" class="d-block m-auto" alt="Pictogramme avec deux personnages" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="card-body pt-0"> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <hr /> | ||
| <p>étudiant·es, collaborateurs et collaboratrices font de l'EPFL une petite ville trépidante et dynamique</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| {% set icon = icon|default("https://via.placeholder.com/") %} | ||
| <div class="card"> | ||
| <div class="card border-0 bg-white m-0 h-100"> | ||
| <div class="card-header border-0"> | ||
| <div class="row"> | ||
| <div class="col-md-6"> | ||
| <p class="h4">près de 18'000</p> | ||
| </div> | ||
| <div class="col-md-6 text-right"> | ||
| <img src="images/styleguide/key-numbers/students.png" class="d-block m-auto" alt="Pictogramme avec deux personnages" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="card-body pt-0"> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <hr /> | ||
| <p>étudiant·es, collaborateurs et collaboratrices font de l'EPFL une petite ville trépidante et dynamique</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
assets/components/organisms/key-number-group/key-number-group-hn.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <div class="container"> | ||
| <div class="card-deck"> | ||
| {% include '@molecules/key-number/key-number-hn-link.twig' %} | ||
| {% include '@molecules/key-number/key-number-hn-link.twig' %} | ||
| {% include '@molecules/key-number/key-number-hn.twig' %} | ||
| </div> | ||
| </div> |
3 changes: 3 additions & 0 deletions
3
assets/components/organisms/key-number-group/key-number-group.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| title: Key number group | ||
| name: key-number-group | ||
| wrapper: bg-gray-100 | ||
| variants: | ||
| - name: hn | ||
| title: Highlighted number |
Oops, something went wrong.