[fonts][GDPR][m] Move font to local for GDPR - Fix

datopian · Oct 9, 2023 · b5738f3 · b5738f3
1 parent acc7f12
commit b5738f3
Show file tree

Hide file tree

Showing 40 changed files with 5 additions and 43 deletions.
diff --git a/ckanext/ubdc/assets/css/style.css b/ckanext/ubdc/assets/css/style.css
@@ -5,7 +5,7 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
-@import url("/base/fonts/stylesheet.css");
+@import url("../../../base/fonts/stylesheet.css?family=Open+Sans:300,200,400,600,600,700");
 html {
   font-family: sans-serif;
   -ms-text-size-adjust: 100%;

diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-Bold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-Bold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-BoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-BoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-ExtraBold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-ExtraBold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-ExtraBoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-Italic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-Italic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-Light.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-Light.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-LightItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-LightItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-Medium.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-Medium.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-MediumItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-MediumItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-Regular.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-Regular.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-SemiBold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-SemiBold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans-SemiBoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans-SemiBoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/open-sans.ttf → ckanext/ubdc/public/base/fonts/OpenSans.ttf b/ckanext/ubdc/public/base/fonts/open-sans.ttf → ckanext/ubdc/public/base/fonts/OpenSans.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Bold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Bold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-BoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-BoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-ExtraBold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-ExtraBold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Italic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Italic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Light.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Light.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-LightItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-LightItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Medium.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Medium.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-MediumItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-MediumItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Regular.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-Regular.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-SemiBold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-SemiBold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-SemiBoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_Condensed-SemiBoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Bold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Bold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-BoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-BoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-ExtraBold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-ExtraBold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Italic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Italic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Light.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Light.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-LightItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-LightItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Medium.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Medium.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-MediumItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-MediumItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Regular.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-Regular.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-SemiBold.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-SemiBold.ttf
diff --git a/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf b/ckanext/ubdc/public/base/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf
diff --git a/ckanext/ubdc/public/base/fonts/stylesheet.css b/ckanext/ubdc/public/base/fonts/stylesheet.css
@@ -1,46 +1,8 @@
 /* Open Sans */
 @font-face {
   font-family: "OpenSans";
-  src: url("OpenSans-Light-webfont.eot");
-  src: url("OpenSans-Light-webfontd41d.eot?#iefix") format("embedded-opentype"),
-    url("OpenSans-Light-webfont.woff") format("woff"),
-    url("OpenSans-Light-webfont.ttf") format("truetype"),
-    url("OpenSans-Light-webfont.svg#OpenSansLight") format("svg");
-  font-weight: normal;
   font-style: normal;
-}
-
-@font-face {
-  font-family: "OpenSans";
-  src: url("OpenSans-LightItalic-webfont.eot");
-  src: url("OpenSans-LightItalic-webfontd41d.eot?#iefix")
-      format("embedded-opentype"),
-    url("OpenSans-LightItalic-webfont.woff") format("woff"),
-    url("OpenSans-LightItalic-webfont.ttf") format("truetype"),
-    url("OpenSans-LightItalic-webfont.svg#OpenSansLightItalic") format("svg");
-  font-weight: normal;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: "OpenSans";
-  src: url("OpenSans-Semibold-webfont.eot");
-  src: url("OpenSans-Semibold-webfontd41d.eot?#iefix")
-      format("embedded-opentype"),
-    url("OpenSans-Semibold-webfont.woff") format("woff"),
-    url("OpenSans-Semibold-webfont.ttf") format("truetype"),
-    url("OpenSans-Semibold-webfont.svg#OpenSansSemibold") format("svg");
-  font-weight: bold;
-  font-style: normal;
-}
-@font-face {
-  font-family: "OpenSans";
-  src: url("OpenSans-SemiboldItalic-webfont.eot");
-  src: url("OpenSans-SemiboldItalic-webfontd41d.eot?#iefix")
-      format("embedded-opentype"),
-    url("OpenSans-SemiboldItalic-webfont.woff") format("woff"),
-    url("OpenSans-SemiboldItalic-webfont.ttf") format("truetype"),
-    url("OpenSans-SemiboldItalic-webfont.svg#OpenSansSemibold") format("svg");
-  font-weight: bold;
-  font-style: italic;
+  font-weight: 300;
+  src: local("Open Sans Regular"), local("OpenSans-Regular"),
+    url("OpenSans.ttf") format("truetype");
 }
diff --git a/ckanext/ubdc/public/base/scss/_variables.scss b/ckanext/ubdc/public/base/scss/_variables.scss
@@ -3,7 +3,7 @@ $imagePath: "../../../base/images";
 $spritePath: "#{$imagePath}/sprite-ckan-icons.png";
 $bgPath: "#{$imagePath}/bg.png";
 $FontAwesomePath: "../../../base/vendor/font-awesome/font";
-@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,200,400,600,600,700');
+@import url('../../../base/fonts/stylesheet.css?family=Open+Sans:300,200,400,600,600,700');
 
 // Branding colors
 $brandPrimary: #F37021;