diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 9bcba51de..55847cca4 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -679,6 +679,12 @@ nUsers: "{n}ユーザー" nNotes: "{n}ノート" sendErrorReports: "エラーリポートを送信" sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がMisskeyに共有され、ソフトウェアの品質向上に役立てることができます。" +myTheme: "マイテーマ" +backgroundColor: "背景" +accentColor: "アクセント" +textColor: "文字" +saveAs: "名前を付けて保存" +advanced: "高度" _aboutMisskey: about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。" diff --git a/src/client/components/sample.vue b/src/client/components/sample.vue index b6300ba44..8fd79ceec 100644 --- a/src/client/components/sample.vue +++ b/src/client/components/sample.vue @@ -15,7 +15,7 @@ This is the button -
+
@@ -49,7 +49,7 @@ export default defineComponent({ data() { return { text: '', - flag: false, + flag: true, radio: 'misskey', mfm: `Hello world! This is an @example mention. BTW you are @${this.$i.username}.\nAlso, here is ${config.url} and [example link](${config.url}). for more details, see https://example.com.\nAs you know #misskey is open-source software.` } diff --git a/src/client/pages/advanced-theme-editor.vue b/src/client/pages/advanced-theme-editor.vue new file mode 100644 index 000000000..1f5e26037 --- /dev/null +++ b/src/client/pages/advanced-theme-editor.vue @@ -0,0 +1,353 @@ + + + + + diff --git a/src/client/pages/settings/theme.vue b/src/client/pages/settings/theme.vue index dd7911ce3..da1ad618b 100644 --- a/src/client/pages/settings/theme.vue +++ b/src/client/pages/settings/theme.vue @@ -49,11 +49,14 @@ {{ $ts.removeWallpaper }} - {{ $ts._theme.explore }} - {{ $ts._theme.make }} + {{ $ts._theme.explore }} + {{ $ts._theme.install }} - {{ $ts._theme.install }} + + {{ $ts._theme.make }} + {{ $ts._theme.make }} ({{ $ts.advanced }}) + {{ $ts._theme.manage }} @@ -61,7 +64,7 @@ diff --git a/src/client/router.ts b/src/client/router.ts index 2826f4ac1..5753a4702 100644 --- a/src/client/router.ts +++ b/src/client/router.ts @@ -29,6 +29,7 @@ export const router = createRouter({ { path: '/featured', component: page('featured') }, { path: '/docs', component: page('docs') }, { path: '/theme-editor', component: page('theme-editor') }, + { path: '/advanced-theme-editor', component: page('advanced-theme-editor') }, { path: '/docs/:doc', component: page('doc'), props: route => ({ doc: route.params.doc }) }, { path: '/explore', component: page('explore') }, { path: '/explore/tags/:tag', props: true, component: page('explore') }, diff --git a/src/client/themes/_dark.json5 b/src/client/themes/_dark.json5 index 18075ac32..847c0b4ec 100644 --- a/src/client/themes/_dark.json5 +++ b/src/client/themes/_dark.json5 @@ -15,11 +15,11 @@ focus: ':alpha<0.3<@accent', bg: '#000', acrylicBg: ':alpha<0.5<@bg', - fg: '#c7d1d8', + fg: '#dadada', fgHighlighted: ':lighten<3<@fg', divider: 'rgba(255, 255, 255, 0.1)', indicator: '@accent', - panel: '#000', + panel: ':lighten<3<@bg', panelHighlight: ':lighten<3<@panel', panelHeaderBg: ':lighten<3<@panel', panelHeaderFg: '@fg', diff --git a/src/client/themes/_light.json5 b/src/client/themes/_light.json5 index 2b9bbdd5f..d75e94afd 100644 --- a/src/client/themes/_light.json5 +++ b/src/client/themes/_light.json5 @@ -15,11 +15,11 @@ focus: ':alpha<0.3<@accent', bg: '#fff', acrylicBg: ':alpha<0.5<@bg', - fg: '#5c6a73', + fg: '#5f5f5f', fgHighlighted: ':darken<3<@fg', divider: 'rgba(0, 0, 0, 0.1)', indicator: '@accent', - panel: '#fff', + panel: ':lighten<3<@bg', panelHighlight: ':darken<3<@panel', panelHeaderBg: ':lighten<3<@panel', panelHeaderFg: '@fg',