Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

相対パスの修正 #269

Merged
merged 2 commits into from
Mar 9, 2020
Merged

相対パスの修正 #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6bac21
fix CSP
Mar 9, 2020
fd483ad
fix icon font path
Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/javascript/styles/mastodon-material-dev/config.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
0 .../styles/fonts/MaterialIcons-Regular.woff2 → ...ial-dev/fonts/MaterialIcons-Regular.woff2
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions config/initializers/content_security_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ def host_to_url(str)
base_host = Rails.configuration.x.web_domain

assets_host = Rails.configuration.action_controller.asset_host
assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}"
assets_host ||= host_to_url(base_host)

media_host = host_to_url(ENV['S3_ALIAS_HOST'])
Expand All @@ -21,7 +20,7 @@ def host_to_url(str)
p.base_uri :none
p.default_src :none
p.frame_ancestors :none
p.font_src :self, assets_host, google_font_host
p.font_src :self, assets_host
p.img_src :self, :https, :data, :blob, assets_host
p.style_src :self, :unsafe_inline, assets_host
p.media_src :self, :https, :data, assets_host
Expand Down