From 74fa954afa2b2a249257866057a9ff8040d0b510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 4 Nov 2018 10:36:54 +0100
Subject: [PATCH 1/2] scss: fix declaration of Asap font (#27728)

---
 ...Asap-Italic.otf => Asap-RegularItalic.otf} | Bin
 static/hautes-alpes-2018/_vars.scss           |  10 ++++----
 static/includes/_font-asap.scss               |  23 ++++++++++--------
 3 files changed, 18 insertions(+), 15 deletions(-)
 rename static/fonts/asap/{Asap-Italic.otf => Asap-RegularItalic.otf} (100%)

diff --git a/static/fonts/asap/Asap-Italic.otf b/static/fonts/asap/Asap-RegularItalic.otf
similarity index 100%
rename from static/fonts/asap/Asap-Italic.otf
rename to static/fonts/asap/Asap-RegularItalic.otf
diff --git a/static/hautes-alpes-2018/_vars.scss b/static/hautes-alpes-2018/_vars.scss
index 1e239e4b..d4bdc847 100644
--- a/static/hautes-alpes-2018/_vars.scss
+++ b/static/hautes-alpes-2018/_vars.scss
@@ -5,7 +5,7 @@ $width: 1170px;
 $mobile-limit: 768px;
 $tablet-limit: 1024px;
 $font-color: #202020;
-$font-family: Asap-Regular, sans-serif;
+$font-family: Asap, sans-serif;
 $font-size: 62.5%;
 $footer-color: #FFFFFF;
 $footer-background: #2B2B2B;
@@ -15,7 +15,7 @@ $link-color: #202020;
 
 $title-background: transparent;
 $title-color: $font-color;
-$title-font-family: Asap-Regular, sans-serif;
+$title-font-family: Asap, sans-serif;
 $title-font-size: 2.5rem;
 $title-padding: 1ex 0.5rem;
 $title-margin: 0;
@@ -78,9 +78,9 @@ $minus-icon : '\f068';
 
 %title-style {
 	margin: $title-margin;
-	font-family: Asap-Medium, sans-serif;
-	font-weight: 600;
+	font-family: Asap, sans-serif;
+	font-weight: 500;
 	font-size: $title-font-size;
 	line-height: 1.2;
 	padding: $title-padding;
-}
\ No newline at end of file
+}
diff --git a/static/includes/_font-asap.scss b/static/includes/_font-asap.scss
index 3da3bdcb..04ac0394 100644
--- a/static/includes/_font-asap.scss
+++ b/static/includes/_font-asap.scss
@@ -1,18 +1,21 @@
 $asap-font-path: '../fonts/asap' !default;
 
-@mixin asap-font($type, $weight, $style) {
+@mixin asap-font($type, $weight) {
 	@font-face {
-		font-family: 'Asap-#{$type}';
+		font-family: 'Asap';
 		src: url('#{$asap-font-path}/Asap-#{$type}.otf') format('opentype');
 		font-weight: $weight;
-		font-style: $style;
+		font-style: normal;
 	}
+	@font-face {
+		font-family: 'Asap';
+		src: url('#{$asap-font-path}/Asap-#{$type}Italic.otf') format('opentype');
+		font-weight: $weight;
+		font-style: italic;
+	}
+
 }
 
-@include asap-font('Italic', 400, italic);
-@include asap-font('MediumItalic', 600, italic);
-@include asap-font('BoldItalic', 700, italic);
-@include asap-font('Regular', 400, normal);
-@include asap-font('Medium', 500, normal);
-@include asap-font('Medium', 600, normal);
-@include asap-font('Bold', 700, normal);
\ No newline at end of file
+@include asap-font('Regular', 400);
+@include asap-font('Medium', 600);
+@include asap-font('Bold', 700);
-- 
2.19.1