diff --git a/app/javascript/styles/instance-ticker-type-0-contrast.scss b/app/javascript/styles/instance-ticker-type-0-contrast.scss new file mode 100644 index 0000000000000000000000000000000000000000..a6b805370a9d0e048c72f113eef44af49a6be992 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-0-contrast.scss @@ -0,0 +1,4 @@ +@import 'contrast/variables'; +@import 'application'; +@import 'contrast/diff'; +@import url("https://miy.pw/css/0.css"); diff --git a/app/javascript/styles/instance-ticker-type-0-light.scss b/app/javascript/styles/instance-ticker-type-0-light.scss new file mode 100644 index 0000000000000000000000000000000000000000..bf6d22f7fd47dc349c5faaf6c04fd5f060605ca0 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-0-light.scss @@ -0,0 +1,4 @@ +@import 'mastodon-light/variables'; +@import 'application'; +@import 'mastodon-light/diff'; +@import url("https://miy.pw/css/0.css"); diff --git a/app/javascript/styles/instance-ticker-type-0.scss b/app/javascript/styles/instance-ticker-type-0.scss new file mode 100644 index 0000000000000000000000000000000000000000..251148ccd6e7f64276e7c801699778109110822f --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-0.scss @@ -0,0 +1,2 @@ +@import 'application'; +@import url("https://miy.pw/css/0.css"); diff --git a/app/javascript/styles/instance-ticker-type-1-contrast.scss b/app/javascript/styles/instance-ticker-type-1-contrast.scss new file mode 100644 index 0000000000000000000000000000000000000000..54d543bd62cb746e8915e3363d8e4a1930e0bb6c --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-1-contrast.scss @@ -0,0 +1,4 @@ +@import 'contrast/variables'; +@import 'application'; +@import 'contrast/diff'; +@import url("https://miy.pw/css/1.css"); diff --git a/app/javascript/styles/instance-ticker-type-1-light.scss b/app/javascript/styles/instance-ticker-type-1-light.scss new file mode 100644 index 0000000000000000000000000000000000000000..046b6b112beed2dc54b5c5447c03dceede2e77d4 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-1-light.scss @@ -0,0 +1,4 @@ +@import 'mastodon-light/variables'; +@import 'application'; +@import 'mastodon-light/diff'; +@import url("https://miy.pw/css/1.css"); diff --git a/app/javascript/styles/instance-ticker-type-1.scss b/app/javascript/styles/instance-ticker-type-1.scss new file mode 100644 index 0000000000000000000000000000000000000000..9a0e39b7be9c60b6512df0d58b569b8dfca76a0d --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-1.scss @@ -0,0 +1,2 @@ +@import 'application'; +@import url("https://miy.pw/css/1.css"); diff --git a/app/javascript/styles/instance-ticker-type-10-contrast.scss b/app/javascript/styles/instance-ticker-type-10-contrast.scss new file mode 100644 index 0000000000000000000000000000000000000000..06c329e64da9d5abf9645108e532651371ca6003 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-10-contrast.scss @@ -0,0 +1,4 @@ +@import 'contrast/variables'; +@import 'application'; +@import 'contrast/diff'; +@import url("https://miy.pw/css/10.css"); diff --git a/app/javascript/styles/instance-ticker-type-10-light.scss b/app/javascript/styles/instance-ticker-type-10-light.scss new file mode 100644 index 0000000000000000000000000000000000000000..425ba7942abbe71ba1d8bebac7c039a113433de5 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-10-light.scss @@ -0,0 +1,4 @@ +@import 'mastodon-light/variables'; +@import 'application'; +@import 'mastodon-light/diff'; +@import url("https://miy.pw/css/10.css"); diff --git a/app/javascript/styles/instance-ticker-type-10.scss b/app/javascript/styles/instance-ticker-type-10.scss new file mode 100644 index 0000000000000000000000000000000000000000..2df2ae1cb4b58025b166afee75ada22d2b4f1a3f --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-10.scss @@ -0,0 +1,2 @@ +@import 'application'; +@import url("https://miy.pw/css/10.css"); diff --git a/app/javascript/styles/instance-ticker-type-11-contrast.scss b/app/javascript/styles/instance-ticker-type-11-contrast.scss new file mode 100644 index 0000000000000000000000000000000000000000..90294344471241641fbc2c9172b25ac549b971ae --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-11-contrast.scss @@ -0,0 +1,4 @@ +@import 'contrast/variables'; +@import 'application'; +@import 'contrast/diff'; +@import url("https://miy.pw/css/11.css"); diff --git a/app/javascript/styles/instance-ticker-type-11-light.scss b/app/javascript/styles/instance-ticker-type-11-light.scss new file mode 100644 index 0000000000000000000000000000000000000000..8402aa81b1600d68a06828369de5c51fb59d78c4 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-11-light.scss @@ -0,0 +1,4 @@ +@import 'mastodon-light/variables'; +@import 'application'; +@import 'mastodon-light/diff'; +@import url("https://miy.pw/css/11.css"); diff --git a/app/javascript/styles/instance-ticker-type-11.scss b/app/javascript/styles/instance-ticker-type-11.scss new file mode 100644 index 0000000000000000000000000000000000000000..8325ce67c5fd643df0d9046383ca23229005848a --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-11.scss @@ -0,0 +1,2 @@ +@import 'application'; +@import url("https://miy.pw/css/11.css"); diff --git a/app/javascript/styles/instance-ticker-type-12-contrast.scss b/app/javascript/styles/instance-ticker-type-12-contrast.scss new file mode 100644 index 0000000000000000000000000000000000000000..4950e63e931c5596af6695f3fcbbf069c9ef731f --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-12-contrast.scss @@ -0,0 +1,4 @@ +@import 'contrast/variables'; +@import 'application'; +@import 'contrast/diff'; +@import url("https://miy.pw/css/12.css"); diff --git a/app/javascript/styles/instance-ticker-type-12-light.scss b/app/javascript/styles/instance-ticker-type-12-light.scss new file mode 100644 index 0000000000000000000000000000000000000000..1a31201e03f936c3805a8ef4c7fcfba498da54ad --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-12-light.scss @@ -0,0 +1,4 @@ +@import 'mastodon-light/variables'; +@import 'application'; +@import 'mastodon-light/diff'; +@import url("https://miy.pw/css/12.css"); diff --git a/app/javascript/styles/instance-ticker-type-12.scss b/app/javascript/styles/instance-ticker-type-12.scss new file mode 100644 index 0000000000000000000000000000000000000000..b40a1cb37477d1c3a6261de25b61e0e62998ac23 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-12.scss @@ -0,0 +1,2 @@ +@import 'application'; +@import url("https://miy.pw/css/12.css"); diff --git a/app/javascript/styles/instance-ticker-type-2-contrast.scss b/app/javascript/styles/instance-ticker-type-2-contrast.scss new file mode 100644 index 0000000000000000000000000000000000000000..e804ca96d5f542b1d354acf7cc1903d4f3f67b9b --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-2-contrast.scss @@ -0,0 +1,4 @@ +@import 'contrast/variables'; +@import 'application'; +@import 'contrast/diff'; +@import url("https://miy.pw/css/2.css"); diff --git a/app/javascript/styles/instance-ticker-type-2-light.scss b/app/javascript/styles/instance-ticker-type-2-light.scss new file mode 100644 index 0000000000000000000000000000000000000000..28a5bac07718e52744d29109488fbedb1d2209b9 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-2-light.scss @@ -0,0 +1,4 @@ +@import 'mastodon-light/variables'; +@import 'application'; +@import 'mastodon-light/diff'; +@import url("https://miy.pw/css/2.css"); diff --git a/app/javascript/styles/instance-ticker-type-2.scss b/app/javascript/styles/instance-ticker-type-2.scss new file mode 100644 index 0000000000000000000000000000000000000000..c6b879483c3d75b0dc3a14ac41e84a260168e8c9 --- /dev/null +++ b/app/javascript/styles/instance-ticker-type-2.scss @@ -0,0 +1,2 @@ +@import 'application'; +@import url("https://miy.pw/css/2.css"); diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 98a27a1faf0e9c3f47f0b415d7446ee4958d213a..ef728ac990bb76351360951ac89eac7962273bb0 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -17,6 +17,7 @@ media_host ||= host_to_url(ENV['S3_HOSTNAME']) if ENV['S3_ENABLED'] == 'true' media_host ||= assets_host bootstrap_cdn_host = 'https://maxcdn.bootstrapcdn.com' +instance_ticker_host = 'https://miy.pw' Rails.application.config.content_security_policy do |p| p.base_uri :none @@ -24,7 +25,7 @@ Rails.application.config.content_security_policy do |p| p.frame_ancestors :none p.font_src :self, assets_host, bootstrap_cdn_host p.img_src :self, :https, :data, :blob, assets_host - p.style_src :self, assets_host, bootstrap_cdn_host + p.style_src :self, assets_host, bootstrap_cdn_host, instance_ticker_host p.media_src :self, :https, :data, assets_host p.frame_src :self, :https p.manifest_src :self, assets_host diff --git a/config/locales/en.yml b/config/locales/en.yml index 5b01ffc4ce5e94258659718d5e1f2c87e71cdc14..9c0644da83c5847903f37bace570e1298c79e5cc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1401,6 +1401,24 @@ en: themes: contrast: Mastodon (High contrast) default: Mastodon (Dark) + instance-ticker-type-0-contrast: Mastodon instance ticker Type-0 (High contrast) + instance-ticker-type-0-light: Mastodon instance ticker Type-0 (Light) + instance-ticker-type-0: Mastodon instance ticker Type-0 (Dark) + instance-ticker-type-1-contrast: Mastodon instance ticker Type-1 (High contrast / Favicon Images Style) + instance-ticker-type-1-light: Mastodon instance ticker Type-1 (Light / Favicon Images Style) + instance-ticker-type-1: Mastodon instance ticker Type-1 (Dark / Favicon Images Style) + instance-ticker-type-10-contrast: Mastodon instance ticker Type-10 (High contrast / Lite) + instance-ticker-type-10-light: Mastodon instance ticker Type-10 (Light / Lite) + instance-ticker-type-10: Mastodon instance ticker Type-10 (Dark / Lite) + instance-ticker-type-11-contrast: Mastodon instance ticker Type-11 (High contrast / Favicon Images Style / Lite) + instance-ticker-type-11-light: Mastodon instance ticker Type-11 (Light / Favicon Images Style / Lite) + instance-ticker-type-11: Mastodon instance ticker Type-11 (Dark / Favicon Images Style / Lite) + instance-ticker-type-12-contrast: Mastodon instance ticker Type-12 (High contrast / Favicon Images(White Outline) Style / Lite) + instance-ticker-type-12-light: Mastodon instance ticker Type-12 (Light / Favicon Images(White Outline) Style / Lite) + instance-ticker-type-12: Mastodon instance ticker Type-12 (Dark / Favicon Images(White Outline) Style / Lite) + instance-ticker-type-2-contrast: Mastodon instance ticker Type-2 (High contrast / Favicon Images(White Outline) Style) + instance-ticker-type-2-light: Mastodon instance ticker Type-2 (Light / Favicon Images(White Outline) Style) + instance-ticker-type-2: Mastodon instance ticker Type-2 (Dark / Favicon Images(White Outline) Style) mastodon-light: Mastodon (Light) time: formats: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 21621f79a92ca3e0fbe7d04fba8cc0777281eaf3..0f0a45b10619e7a551811bfc53830270d74ad46e 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1311,6 +1311,24 @@ ja: themes: contrast: Mastodon (ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ) default: Mastodon (ダーク) + instance-ticker-type-0-contrast: Mastodon instance ticker Type-0 (ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ) + instance-ticker-type-0-light: Mastodon instance ticker Type-0 (ライト) + instance-ticker-type-0: Mastodon instance ticker Type-0 (ダーク) + instance-ticker-type-1-contrast: Mastodon instance ticker Type-1 (ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ / Favicon Images) + instance-ticker-type-1-light: Mastodon instance ticker Type-1 (ライト / Favicon Images) + instance-ticker-type-1: Mastodon instance ticker Type-1 (ダーク / Favicon Images) + instance-ticker-type-10-contrast: Mastodon instance ticker Type-10 (ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ / Lite) + instance-ticker-type-10-light: Mastodon instance ticker Type-10 (ライト / Lite) + instance-ticker-type-10: Mastodon instance ticker Type-10 (ダーク / Lite) + instance-ticker-type-11-contrast: Mastodon instance ticker Type-11 (ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ / Favicon Images / Lite) + instance-ticker-type-11-light: Mastodon instance ticker Type-11 (ライト / Favicon Images / Lite) + instance-ticker-type-11: Mastodon instance ticker Type-11 (ダーク / Favicon Images / Lite) + instance-ticker-type-12-contrast: Mastodon instance ticker Type-12 (ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ / Favicon Images(White Outline) / Lite) + instance-ticker-type-12-light: Mastodon instance ticker Type-12 (ライト / Favicon Images(White Outline) / Lite) + instance-ticker-type-12: Mastodon instance ticker Type-12 (ダーク / Favicon Images(White Outline) / Lite) + instance-ticker-type-2-contrast: Mastodon instance ticker Type-2 (ãƒã‚¤ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ / Favicon Images(White Outline)) + instance-ticker-type-2-light: Mastodon instance ticker Type-2 (ライト / Favicon Images(White Outline)) + instance-ticker-type-2: Mastodon instance ticker Type-2 (ダーク / Favicon Images(White Outline)) mastodon-light: Mastodon (ライト) time: formats: diff --git a/config/themes.yml b/config/themes.yml index 9c21c9459f3bcf2b17ec0db4f1bfd6c61be3220e..3b1f97cab3713e4015b9b4794ab02ebec8ccb85b 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -1,3 +1,21 @@ default: styles/application.scss contrast: styles/contrast.scss mastodon-light: styles/mastodon-light.scss +instance-ticker-type-0: styles/instance-ticker-type-0.scss +instance-ticker-type-1: styles/instance-ticker-type-1.scss +instance-ticker-type-2: styles/instance-ticker-type-2.scss +instance-ticker-type-10: styles/instance-ticker-type-10.scss +instance-ticker-type-11: styles/instance-ticker-type-11.scss +instance-ticker-type-12: styles/instance-ticker-type-12.scss +instance-ticker-type-0-contrast: styles/instance-ticker-type-0-contrast.scss +instance-ticker-type-1-contrast: styles/instance-ticker-type-1-contrast.scss +instance-ticker-type-2-contrast: styles/instance-ticker-type-2-contrast.scss +instance-ticker-type-10-contrast: styles/instance-ticker-type-10-contrast.scss +instance-ticker-type-11-contrast: styles/instance-ticker-type-11-contrast.scss +instance-ticker-type-12-contrast: styles/instance-ticker-type-12-contrast.scss +instance-ticker-type-0-light: styles/instance-ticker-type-0-light.scss +instance-ticker-type-1-light: styles/instance-ticker-type-1-light.scss +instance-ticker-type-2-light: styles/instance-ticker-type-2-light.scss +instance-ticker-type-10-light: styles/instance-ticker-type-10-light.scss +instance-ticker-type-11-light: styles/instance-ticker-type-11-light.scss +instance-ticker-type-12-light: styles/instance-ticker-type-12-light.scss