Merge pull request #119 from openstad/fix/amsterdam-typography

Fix/amsterdam typography
openstad · Oct 21, 2022 · a9cdca5 · a9cdca5
2 parents 65dbeed + 1e1b065
commit a9cdca5
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 36 deletions.
diff --git a/public/css/vendor/amsterdam.css b/public/css/vendor/amsterdam.css
@@ -1,44 +1,49 @@
-@font-face{
-    font-family:amsterdam sans;
-    font-style:normal;
-    font-weight:300;
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Light.eot?#iefix);
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Light.eot?#iefix) format("eot"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Light.woff2) format("woff2"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff/AmsterdamSans-Light.woff) format("woff")
+@font-face {
+    font-family: amsterdam sans;
+    font-style: normal;
+    font-weight: 300;
+    src: url(../../fonts/AmsterdamSans-Light.eot?#iefix);
+    src: url(../../fonts/AmsterdamSans-Light.eot?#iefix) format("eot"), url(../../fonts/AmsterdamSans-Light.woff2) format("woff2"), url(../../fonts/AmsterdamSans-Light.woff) format("woff")
 }
-@font-face{
-    font-family:amsterdam sans;
-    font-style:normal;
-    font-weight:400;
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Regular.eot?#iefix);
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Regular.eot?#iefix) format("eot"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Regular.woff2) format("woff2"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff/AmsterdamSans-Regular.woff) format("woff")
+
+@font-face {
+    font-family: amsterdam sans;
+    font-style: normal;
+    font-weight: 400;
+    src: url(../../fonts/AmsterdamSans-Regular.eot?#iefix);
+    src: url(../../fonts/AmsterdamSans-Regular.eot?#iefix) format("eot"), url(../../fonts/AmsterdamSans-Regular.woff2) format("woff2"), url(../../fonts/AmsterdamSans-Regular.woff) format("woff")
 }
-@font-face{
-    font-family:amsterdam sans;
-    font-style:italic;
-    font-weight:400;
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Italic.eot?#iefix);
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Italic.eot?#iefix) format("eot"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Italic.woff2) format("woff2"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff/AmsterdamSans-Italic.woff) format("woff")
+
+@font-face {
+    font-family: amsterdam sans;
+    font-style: italic;
+    font-weight: 400;
+    src: url(../../fonts/AmsterdamSans-Italic.eot?#iefix);
+    src: url(../../fonts/AmsterdamSans-Italic.eot?#iefix) format("eot"), url(../../fonts/AmsterdamSans-Italic.woff2) format("woff2"), url(../../fonts/AmsterdamSans-Italic.woff) format("woff")
 }
-@font-face{
-    font-family:amsterdam sans;
-    font-style:normal;
-    font-weight:700;
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Bold.eot?#iefix);
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Bold.eot?#iefix) format("eot"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-Bold.woff2) format("woff2"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff/AmsterdamSans-Bold.woff) format("woff")
+
+@font-face {
+    font-family: amsterdam sans;
+    font-style: normal;
+    font-weight: 700;
+    src: url(../../fonts/AmsterdamSans-Bold.eot?#iefix);
+    src: url(../../fonts/AmsterdamSans-Bold.eot?#iefix) format("eot"), url(../../fonts/AmsterdamSans-Bold.woff2) format("woff2"), url(../../fonts/AmsterdamSans-Bold.woff) format("woff")
 }
-@font-face{
-    font-family:amsterdam sans;
-    font-style:italic;
-    font-weight:700;
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-BoldItalic.eot?#iefix);
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-BoldItalic.eot?#iefix) format("eot"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-BoldItalic.woff2) format("woff2"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff/AmsterdamSans-BoldItalic.woff) format("woff")
+
+@font-face {
+    font-family: amsterdam sans;
+    font-style: italic;
+    font-weight: 700;
+    src: url(../../fonts/AmsterdamSans-BoldItalic.eot?#iefix);
+    src: url(../../fonts/AmsterdamSans-BoldItalic.eot?#iefix) format("eot"), url(../../fonts/AmsterdamSans-BoldItalic.woff2) format("woff2"), url(../../fonts/AmsterdamSans-BoldItalic.woff) format("woff")
 }
-@font-face{
-    font-family:amsterdam sans;
-    font-style:normal;
-    font-weight:800;
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-ExtraBold.eot?#iefix);
-    src:url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-ExtraBold.eot?#iefix) format("eot"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff2/AmsterdamSans-ExtraBold.woff2) format("woff2"),url(https://www.amsterdam.nl/views/core/fonts/AmsterdamSans/woff/AmsterdamSans-ExtraBold.woff) format("woff")
+
+@font-face {
+    font-family: amsterdam sans;
+    font-style: normal;
+    font-weight: 800;
+    src: url(../../fonts/AmsterdamSans-ExtraBold.eot?#iefix);
+    src: url(../../fonts/AmsterdamSans-ExtraBold.eot?#iefix) format("eot"), url(../../fonts/AmsterdamSans-ExtraBold.woff2) format("woff2"), url(../../fonts/AmsterdamSans-ExtraBold.woff) format("woff")
 }
 
 body,

diff --git a/public/fonts/AmsterdamSans-Bold.eot b/public/fonts/AmsterdamSans-Bold.eot
diff --git a/public/fonts/AmsterdamSans-Bold.woff b/public/fonts/AmsterdamSans-Bold.woff
diff --git a/public/fonts/AmsterdamSans-Bold.woff2 b/public/fonts/AmsterdamSans-Bold.woff2
diff --git a/public/fonts/AmsterdamSans-BoldItalic.eot b/public/fonts/AmsterdamSans-BoldItalic.eot
diff --git a/public/fonts/AmsterdamSans-BoldItalic.woff b/public/fonts/AmsterdamSans-BoldItalic.woff
diff --git a/public/fonts/AmsterdamSans-BoldItalic.woff2 b/public/fonts/AmsterdamSans-BoldItalic.woff2
diff --git a/public/fonts/AmsterdamSans-ExtraBold.eot b/public/fonts/AmsterdamSans-ExtraBold.eot
diff --git a/public/fonts/AmsterdamSans-ExtraBold.woff b/public/fonts/AmsterdamSans-ExtraBold.woff
diff --git a/public/fonts/AmsterdamSans-ExtraBold.woff2 b/public/fonts/AmsterdamSans-ExtraBold.woff2
diff --git a/public/fonts/AmsterdamSans-Italic.eot b/public/fonts/AmsterdamSans-Italic.eot
diff --git a/public/fonts/AmsterdamSans-Italic.woff b/public/fonts/AmsterdamSans-Italic.woff
diff --git a/public/fonts/AmsterdamSans-Italic.woff2 b/public/fonts/AmsterdamSans-Italic.woff2
diff --git a/public/fonts/AmsterdamSans-Light.eot b/public/fonts/AmsterdamSans-Light.eot
diff --git a/public/fonts/AmsterdamSans-Light.woff b/public/fonts/AmsterdamSans-Light.woff
diff --git a/public/fonts/AmsterdamSans-Light.woff2 b/public/fonts/AmsterdamSans-Light.woff2
diff --git a/public/fonts/AmsterdamSans-Regular.eot b/public/fonts/AmsterdamSans-Regular.eot
diff --git a/public/fonts/AmsterdamSans-Regular.woff b/public/fonts/AmsterdamSans-Regular.woff
diff --git a/public/fonts/AmsterdamSans-Regular.woff2 b/public/fonts/AmsterdamSans-Regular.woff2