From f864de23f4996013e1b05b529214794e581f0611 Mon Sep 17 00:00:00 2001 From: Rintan Date: Mon, 9 Mar 2020 11:58:06 +0900 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=AF=BE=E3=83=91=E3=82=B9=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#269)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix CSP * fix icon font path --- .../styles/mastodon-material-dev/config.scss | 4 ++-- .../fonts/MaterialIcons-Regular.woff2 | Bin 2 files changed, 2 insertions(+), 2 deletions(-) rename app/javascript/styles/{ => mastodon-material-dev}/fonts/MaterialIcons-Regular.woff2 (100%) diff --git a/app/javascript/styles/mastodon-material-dev/config.scss b/app/javascript/styles/mastodon-material-dev/config.scss index e733bc8af..cf04ac55b 100644 --- a/app/javascript/styles/mastodon-material-dev/config.scss +++ b/app/javascript/styles/mastodon-material-dev/config.scss @@ -10,12 +10,12 @@ // Material Design Icon settings -// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in .../fonts folder and configure below. +// If you want to use self-hosting font, please place MaterialIcons-Regular.woff2 file in 'fonts' folder and configure below. @font-face { font-family: "Material Icons"; src: local("Material Icons"), //url("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/MaterialIcons-Regular.woff2"); // GitHub //url("https://fonts.gstatic.com/s/materialicons/v50/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2"); // Google Fonts - url("../fonts/MaterialIcons-Regular.woff2"); // Self-hosting + url("fonts/MaterialIcons-Regular.woff2"); // Self-hosting } \ No newline at end of file diff --git a/app/javascript/styles/fonts/MaterialIcons-Regular.woff2 b/app/javascript/styles/mastodon-material-dev/fonts/MaterialIcons-Regular.woff2 similarity index 100% rename from app/javascript/styles/fonts/MaterialIcons-Regular.woff2 rename to app/javascript/styles/mastodon-material-dev/fonts/MaterialIcons-Regular.woff2