From 1cd18b2597de1b8bb1a46619f255913b4740c00a Mon Sep 17 00:00:00 2001 From: Rintan <12230083+Rintan@users.noreply.github.com> Date: Fri, 6 Jan 2023 15:41:48 +0900 Subject: [PATCH] =?UTF-8?q?=E6=96=B0Y-zu=E3=83=86=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=81=B8=E3=81=AE=E7=A7=BB=E8=A1=8C=20=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E3=83=86=E3=83=BC=E3=83=9E=E5=89=8A=E9=99=A4=E3=81=AE=E6=BA=96?= =?UTF-8?q?=E5=82=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 8 ++++++++ app/javascript/styles/y-zu-dark | 1 + app/javascript/styles/y-zu-light | 1 + config/locales/en.yml | 4 ---- config/locales/ja.yml | 4 ---- config/themes.yml | 8 ++------ 6 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 .gitmodules create mode 160000 app/javascript/styles/y-zu-dark create mode 160000 app/javascript/styles/y-zu-light diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..c8e44f31c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,8 @@ +[submodule "app/javascript/styles/y-zu-light"] + path = app/javascript/styles/y-zu-light + url = https://github.com/Y-zu-don-maintenance-org/Mastodon-Material + branch = y-zu-light +[submodule "app/javascript/styles/y-zu-dark"] + path = app/javascript/styles/y-zu-dark + url = https://github.com/Y-zu-don-maintenance-org/Mastodon-Material + branch = y-zu-dark diff --git a/app/javascript/styles/y-zu-dark b/app/javascript/styles/y-zu-dark new file mode 160000 index 000000000..a58c699a6 --- /dev/null +++ b/app/javascript/styles/y-zu-dark @@ -0,0 +1 @@ +Subproject commit a58c699a605784b3318f54717bfaaa804db4d2f3 diff --git a/app/javascript/styles/y-zu-light b/app/javascript/styles/y-zu-light new file mode 160000 index 000000000..a5c228314 --- /dev/null +++ b/app/javascript/styles/y-zu-light @@ -0,0 +1 @@ +Subproject commit a5c22831445f5669315434f7df49c3c1e1f70d20 diff --git a/config/locales/en.yml b/config/locales/en.yml index dde7b221d..31c9cac9b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1612,19 +1612,15 @@ en: contrast: Mastodon (High contrast) default: Mastodon (Dark) mastodon-light: Mastodon (Light) - mastodon-auto: Mastodon (Auto) # additional theme material-black: Material (Black) material-dark: Material (Dark) material-light: Material (Light) - material-auto: Material (Auto) mastodon-material-dark: Mastodon Material (Dark) mastodon-material-light: Mastodon Material (Light) - mastodon-material-auto: Mastodon Material (Auto) plus: Plus y-zu-dark: Y-zu (Dark) y-zu-light: Y-zu (Light) - y-zu-auto: Y-zu (Auto) time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5100f9731..0d977fbad 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1568,19 +1568,15 @@ ja: contrast: Mastodon (ハイコントラスト) default: Mastodon (ダーク) mastodon-light: Mastodon (ライト) - mastodon-auto: Mastodon (自動) # 追加テーマ material-black: Material (黒) material-dark: Material (ダーク) material-light: Material (ライト) - material-auto: Material (自動) mastodon-material-dark: Mastodon Material (ダーク) mastodon-material-light: Mastodon Material (ライト) - mastodon-material-auto: Mastodon Material (自動) plus: Plus y-zu-dark: Y-zu (ダーク) y-zu-light: Y-zu (ライト) - y-zu-auto: Y-zu (自動) time: formats: default: "%Y年%m月%d日 %H:%M" diff --git a/config/themes.yml b/config/themes.yml index cea5258c2..4de8351ba 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -1,17 +1,13 @@ default: styles/application.scss contrast: styles/contrast.scss mastodon-light: styles/mastodon-light.scss -mastodon-auto: styles/mastodon-auto.scss # 追加テーマ material-black: styles/material-black.scss material-dark: styles/material-dark.scss material-light: styles/material-light.scss -material-auto: styles/material-auto.scss mastodon-material-dark: styles/mastodon-material-dark.scss mastodon-material-light: styles/mastodon-material-light.scss -mastodon-material-auto: styles/mastodon-material-auto.scss plus: styles/plus.scss -y-zu-dark: styles/y-zu-dark.scss -y-zu-light: styles/y-zu-light.scss -y-zu-auto: styles/y-zu-auto.scss +y-zu-dark: styles/y-zu-dark/src/mastodon-material.scss +y-zu-light: styles/y-zu-light/src/mastodon-material.scss