Merge branch 'release/2.0.3'

epfl-si · May 8, 2019 · 6aa57fa · 6aa57fa
2 parents 9904f0c + b8b391b
commit 6aa57fa
Show file tree

Hide file tree

Showing 11 changed files with 5,192 additions and 2,929 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+*2.0.3* (2019-05-08)
+  - 🛠 Fixes & other
+    - Fix breadcrumb x-scroll overflow (#383)
+    - Fix title for study plan (#383)
+    - Fix doc on font (#385)
+    - Update dependancies
+
 *2.0.2* (2019-04-23)
   - 🛠 Fixes & other
     - Fix breadcrumb folding (#379)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.2
+2.0.3
diff --git a/assets/components/atoms/list/list.scss b/assets/components/atoms/list/list.scss
@@ -13,14 +13,14 @@
 
     &:before {
       content: '';
-      background: $red;
+      position: absolute;
       top: 0.7rem;
       right: calc(100% - 0.5rem);
-      font-size: 1.1rem;
-      line-height: $bullet-size;
-      position: absolute;
       width: 6px;
       height: 5px;
+      font-size: 1.1rem;
+      line-height: $bullet-size;
+      background: $red;
     }
   }
 

diff --git a/assets/components/content-types/study-plan/study-plan.scss b/assets/components/content-types/study-plan/study-plan.scss
@@ -82,12 +82,17 @@
       }
     }
 
-    h4 {
+    h3, h4 {
       grid-column: 1 / -1;
       background-color: $body-bg;
       margin-bottom: 0;
       padding-bottom: $headings-margin-bottom;
     }
+
+    .line-down + h3,
+    .line-down +  h4 {
+      padding-top: 2em;
+    }
 
     .first-line + .clear,
     .line + .clear {

diff --git a/assets/components/molecules/breadcrumb/breadcrumb.scss b/assets/components/molecules/breadcrumb/breadcrumb.scss
@@ -57,7 +57,7 @@
 
   @include media-breakpoint-down(lg) {
     //height: $mm-breadcrumbs-height;
-    overflow-x: scroll;
+    //overflow-x: scroll;
     //white-space: nowrap;
     margin: 0;
     padding: $spacer * 0.64 0;

diff --git a/assets/components/organisms/header/header.scss b/assets/components/organisms/header/header.scss
@@ -54,8 +54,8 @@
         position: absolute;
         top: 1em;
         left: 0.8rem;
-        height: 6px;
         width: 7px;
+        height: 6px;
         background: $red;
         opacity: 0;
         transform: none;

diff --git a/assets/config/bootstrap-variables.scss b/assets/config/bootstrap-variables.scss
@@ -206,8 +206,10 @@ $transition-collapse:         height .35s ease !default;
 // Font, line-height, and color for body text, headings, and more.
 
 // stylelint-disable value-keyword-case
-$font-family-sans-serif:      "Open Sans", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
-$font-family-monospace:       SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
+// official font is Suisse Int'l, but the license only allow to host
+// on a epfl domain, so we set it to Arial, the official fallback
+$font-family-sans-serif:      Arial, sans-serif, !default;
+$font-family-monospace:       monospace !default;
 $font-family-base:            $font-family-sans-serif !default;
 // stylelint-enable value-keyword-case
 

diff --git a/assets/config/data.json b/assets/config/data.json
@@ -320,10 +320,10 @@
           "urlen": "https://www.epfl.ch/education/continuing-education/"
         },
         {
-          "namefr": "Mobilité",
-          "urlfr": "https://www.epfl.ch/education/mobility/fr/mobilite/",
-          "nameen": "Mobility",
-          "urlen": "https://www.epfl.ch/education/mobility/en/mobility/"
+          "namefr": "International",
+          "urlfr": "https://www.epfl.ch/education/international/fr/mobilite/",
+          "nameen": "International",
+          "urlen": "https://www.epfl.ch/education/international/en/mobility/"
         },
         {
           "namefr": "Admission",

diff --git a/docs/design/typography.html b/docs/design/typography.html
@@ -2,7 +2,7 @@
   <h1 class="my-2">Typography</h1>
 
   <p class="mt-5">
-    Element use the <strong><a href="https://fonts.google.com/specimen/Open+Sans">Open Sans</a></strong> font familly directly from <a href="https://fonts.google.com/">Google Fonts</a>.
+    Element use the <strong>Suisse Int'l</strong> (see <a href="https://www.epfl.ch/campus/services/communication/wp-content/uploads/2019/03/EPFL-brand-guidelines.pdf">Brand Guidelines</a>), has nine weights and is suitable for all uses, from titles to legends. If you do not have access or wish to use an authorysed alternative, you must use Arial. On office materials, Arial is used exclusively, because it is available as a system font on all computers, making it easy to share editable documents.
   </p>
 
   <div class="row my-5">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "epfl-elements",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "MIT",
   "main": "index.html",
   "repository": {