Use official font CDN (#26)

equinor · Feb 5, 2020 · 343f614 · 343f614
1 parent bbb81b7
commit 343f614
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 119 deletions.
diff --git a/setup.py b/setup.py
@@ -17,9 +17,7 @@
     entry_points={
         "webviz_config_themes": ["equinor_theme = webviz_config_equinor:equinor_theme"]
     },
-    install_requires=[
-        'webviz-config>=0.0.23'
-    ],
+    install_requires=["webviz-config>=0.0.23"],
     tests_require=tests_require,
     extras_require={"tests": tests_require},
     setup_requires=["setuptools_scm~=3.2"],

diff --git a/webviz_config_equinor/__init__.py b/webviz_config_equinor/__init__.py
@@ -13,8 +13,17 @@
 
 equinor_theme = WebvizConfigTheme(theme_name="equinor")
 
+equinor_theme.external_stylesheets = [
+    "https://eds-static.equinor.com/font/equinor-font.css"
+]
+
 equinor_theme.adjust_csp(
-    {"font-src": ["https://webviz-cdn.azureedge.net"],}
+    {
+        "font-src": ["https://eds-static.equinor.com"],
+        "img-src": ["https://eds-static.equinor.com"],
+        "style-src": ["https://eds-static.equinor.com"],
+    },
+    append=True,
 )
 
 equinor_theme.assets = glob.glob(

diff --git a/webviz_config_equinor/assets/equinor_fonts.css b/webviz_config_equinor/assets/equinor_fonts.css
diff --git a/webviz_config_equinor/assets/equinor_local.css b/webviz_config_equinor/assets/equinor_local.css
@@ -24,7 +24,7 @@ h1, h2, h3, h4, h5, h6, p, a, div, button {
   height: 100px;
   width: 200px;
   background-size: contain;
-  background-image: url("./equinor_logo_primary.svg#red");
+  background-image: url("https://eds-static.equinor.com/logo/equinor-logo-primary.svg#red");
   background-repeat: no-repeat;
 }
 

diff --git a/webviz_config_equinor/assets/equinor_logo_primary.svg b/webviz_config_equinor/assets/equinor_logo_primary.svg