From b90a0143a3342e8fef75983e41248d263c5e1f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Lechtenb=C3=B6rger?= Date: Tue, 28 Apr 2020 14:48:31 +0200 Subject: [PATCH 1/4] Use relative, local URLs for fonts. Partially addresses issue #360. --- dist/codemirror.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/codemirror.css b/dist/codemirror.css index 0308c85a..b91f71e2 100644 --- a/dist/codemirror.css +++ b/dist/codemirror.css @@ -1,8 +1,8 @@ @font-face { font-family: 'FiraCode'; - src: url('https://viebel.github.io/klipse/fonts/FiraCode/woff2/FiraCode-Regular.woff2') format('webfont.woff2') , /* Super Modern Browsers */ - url('https://viebel.github.io/klipse/fonts/FiraCode/woff/FiraCode-Regular.woff') format('woff'), /* Pretty Modern Browsers */ - url('https://viebel.github.io/klipse/fonts/FiraCode/ttf/FiraCode-Regular.ttf') format('truetype') /* Safari, Android, iOS */; + src: url('FiraCode/woff2/FiraCode-Regular.woff2') format('webfont.woff2') , /* Super Modern Browsers */ + url('FiraCode/woff/FiraCode-Regular.woff') format('woff'), /* Pretty Modern Browsers */ + url('FiraCode/ttf/FiraCode-Regular.ttf') format('truetype') /* Safari, Android, iOS */; } /* BASICS */ From 7a03a0274cf9b491f64a8f22f3d20df2c715a613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Lechtenb=C3=B6rger?= Date: Fri, 5 Jun 2020 08:59:50 +0200 Subject: [PATCH 2/4] Use relative paths in source CSS file --- resources/public/css/codemirror.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/public/css/codemirror.css b/resources/public/css/codemirror.css index 0308c85a..b91f71e2 100644 --- a/resources/public/css/codemirror.css +++ b/resources/public/css/codemirror.css @@ -1,8 +1,8 @@ @font-face { font-family: 'FiraCode'; - src: url('https://viebel.github.io/klipse/fonts/FiraCode/woff2/FiraCode-Regular.woff2') format('webfont.woff2') , /* Super Modern Browsers */ - url('https://viebel.github.io/klipse/fonts/FiraCode/woff/FiraCode-Regular.woff') format('woff'), /* Pretty Modern Browsers */ - url('https://viebel.github.io/klipse/fonts/FiraCode/ttf/FiraCode-Regular.ttf') format('truetype') /* Safari, Android, iOS */; + src: url('FiraCode/woff2/FiraCode-Regular.woff2') format('webfont.woff2') , /* Super Modern Browsers */ + url('FiraCode/woff/FiraCode-Regular.woff') format('woff'), /* Pretty Modern Browsers */ + url('FiraCode/ttf/FiraCode-Regular.ttf') format('truetype') /* Safari, Android, iOS */; } /* BASICS */ From 3f4c74975d282a959940b246ec31aa79e7439b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Lechtenb=C3=B6rger?= Date: Fri, 5 Jun 2020 17:32:20 +0200 Subject: [PATCH 3/4] Revert "Use relative paths in source CSS file" This reverts commit 7a03a0274cf9b491f64a8f22f3d20df2c715a613. Do not touch source file. --- resources/public/css/codemirror.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/public/css/codemirror.css b/resources/public/css/codemirror.css index b91f71e2..0308c85a 100644 --- a/resources/public/css/codemirror.css +++ b/resources/public/css/codemirror.css @@ -1,8 +1,8 @@ @font-face { font-family: 'FiraCode'; - src: url('FiraCode/woff2/FiraCode-Regular.woff2') format('webfont.woff2') , /* Super Modern Browsers */ - url('FiraCode/woff/FiraCode-Regular.woff') format('woff'), /* Pretty Modern Browsers */ - url('FiraCode/ttf/FiraCode-Regular.ttf') format('truetype') /* Safari, Android, iOS */; + src: url('https://viebel.github.io/klipse/fonts/FiraCode/woff2/FiraCode-Regular.woff2') format('webfont.woff2') , /* Super Modern Browsers */ + url('https://viebel.github.io/klipse/fonts/FiraCode/woff/FiraCode-Regular.woff') format('woff'), /* Pretty Modern Browsers */ + url('https://viebel.github.io/klipse/fonts/FiraCode/ttf/FiraCode-Regular.ttf') format('truetype') /* Safari, Android, iOS */; } /* BASICS */ From 88b6e125edfd76f621ff6d8abd3d77bbc7e6c627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Lechtenb=C3=B6rger?= Date: Fri, 5 Jun 2020 17:42:09 +0200 Subject: [PATCH 4/4] Turn remote URL into local file --- scripts/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index d057a2c2..46f55a53 100755 --- a/scripts/build +++ b/scripts/build @@ -13,4 +13,5 @@ cp resources/public/plugin_prod/public/cljs-out/plugin_prod-main.js resources/pu ./scripts/add_license resources/public/plugin_prod/js/klipse_plugin.min.js ./scripts/add_license resources/public/plugin/js/klipse_plugin.js -cp resources/public/css/codemirror.css resources/public/plugin/js/klipse_plugin.js resources/public/plugin_prod/js/klipse_plugin.min.js dist/ +cp resources/public/plugin/js/klipse_plugin.js resources/public/plugin_prod/js/klipse_plugin.min.js dist/ +sed 's#https://viebel.github.io/klipse/fonts/##g' resources/public/css/codemirror.css > dist/codemirror.css