add custom font styles

openpoke · Jul 24, 2024 · 373a40a · 373a40a
1 parent bf0917e
commit 373a40a
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -410,7 +410,7 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
@@ -482,9 +482,9 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    icalendar (2.10.1)
+    icalendar (2.10.2)
       ice_cube (~> 0.16)
-    ice_cube (0.16.4)
+    ice_cube (0.17.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -627,7 +627,7 @@ GEM
       premailer (~> 1.7, >= 1.7.9)
     psych (4.0.6)
       stringio
-    public_suffix (6.0.0)
+    public_suffix (6.0.1)
     puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
@@ -780,7 +780,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
     sassc (2.4.0)
       ffi (~> 1.9)
-    selenium-webdriver (4.22.0)
+    selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)

diff --git a/app/packs/fonts/DMSans-Bold.ttf b/app/packs/fonts/DMSans-Bold.ttf
diff --git a/app/packs/fonts/DMSans-BoldItalic.ttf b/app/packs/fonts/DMSans-BoldItalic.ttf
diff --git a/app/packs/fonts/DMSans-Italic.ttf b/app/packs/fonts/DMSans-Italic.ttf
diff --git a/app/packs/fonts/DMSans-Light.ttf b/app/packs/fonts/DMSans-Light.ttf
diff --git a/app/packs/fonts/DMSans-LightItalic.ttf b/app/packs/fonts/DMSans-LightItalic.ttf
diff --git a/app/packs/fonts/DMSans-Medium.ttf b/app/packs/fonts/DMSans-Medium.ttf
diff --git a/app/packs/fonts/DMSans-MediumItalic.ttf b/app/packs/fonts/DMSans-MediumItalic.ttf
diff --git a/app/packs/fonts/DMSans-Regular.ttf b/app/packs/fonts/DMSans-Regular.ttf
diff --git a/app/packs/fonts/DMSans-SemiBold.ttf b/app/packs/fonts/DMSans-SemiBold.ttf
diff --git a/app/packs/fonts/DMSans-SemiBoldItalic.ttf b/app/packs/fonts/DMSans-SemiBoldItalic.ttf
diff --git a/app/packs/fonts/PPEditorialNew-Regular.otf b/app/packs/fonts/PPEditorialNew-Regular.otf
diff --git a/app/packs/fonts/PPEditorialNew-Ultralight.otf b/app/packs/fonts/PPEditorialNew-Ultralight.otf
diff --git a/app/packs/stylesheets/decidim/decidim_application.scss b/app/packs/stylesheets/decidim/decidim_application.scss
@@ -6,3 +6,5 @@
 // available at https://docs.decidim.org/en/develop/customize/styles.html#_tailwind_css
 //
 // By default this is empty.
+
+@import "../partials/fonts";
diff --git a/app/packs/stylesheets/partials/_fonts.scss b/app/packs/stylesheets/partials/_fonts.scss
@@ -0,0 +1,83 @@
+@font-face {
+  font-family: 'PP Editorial New';
+  src: url("fonts/PPEditorialNew-Regular.otf") format('opentype');
+  font-style: normal;
+  font-weight: 600;
+}
+
+@font-face {
+  font-family: 'PP Editorial New';
+  src: url("fonts/PPEditorialNew-Ultralight.otf") format('opentype');
+  font-style: normal;
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-Bold.ttf") format('truetype');
+  font-style: normal;
+  font-weight: 700;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-BoldItalic.ttf") format('truetype');
+  font-style: italic;
+  font-weight: 700;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-Regular.ttf") format('truetype');
+  font-style: normal;
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-Italic.ttf") format('truetype');
+  font-style: italic;
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-Medium.ttf") format('truetype');
+  font-style: normal;
+  font-weight: 500;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-MediumItalic.ttf") format('truetype');
+  font-style: italic;
+  font-weight: 500;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-Light.ttf") format('truetype');
+  font-style: normal;
+  font-weight: 300;
+}
+
+@font-face {
+  font-family: 'DM Sans';
+  src: url("fonts/DMSans-LightItalic.ttf") format('truetype');
+  font-style: italic;
+  font-weight: 300;
+}
+
+body {
+  font-family: 'DM Sans', sans-serif;
+}
+h1, .h1,
+h2, .h2,
+h3, .h3,
+h4, .h4,
+h5, .h5,
+h6, .h6,
+.home__section-title,
+.title-decorator {
+  font-family: 'PP Editorial New', serif;
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "@decidim/elections": "file:packages/elections",
     "@decidim/webpacker": "file:packages/webpacker",
     "@rails/actioncable": "^6.1.7",
-    "codemirror": "^5.65.16",
+    "codemirror": "^5.65.17",
     "form-storage": "^1.3.5",
     "formBuilder": "^3.19.12",
     "highlight.js": "^11.10.0",