From 5cf313ce3b820b9590599e29e96dfff147c11b2d Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 18:15:01 -0700 Subject: [PATCH 1/8] more rpine --- packages/client/src/ui/visitor/kanban.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue index f191fc059a..7c2181eaea 100644 --- a/packages/client/src/ui/visitor/kanban.vue +++ b/packages/client/src/ui/visitor/kanban.vue @@ -33,7 +33,7 @@ - + From 66c5715ee4ea78192bcc4ecf73f1d2b0f379888e Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 18:15:01 -0700 Subject: [PATCH 2/8] More rpine --- packages/client/src/widgets/activity.calendar.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/src/widgets/activity.calendar.vue b/packages/client/src/widgets/activity.calendar.vue index 33b95b00db..2fcb7255cc 100644 --- a/packages/client/src/widgets/activity.calendar.vue +++ b/packages/client/src/widgets/activity.calendar.vue @@ -19,7 +19,7 @@ rx="1" ry="1" fill="none" stroke-width="0.1" - stroke="#f73520"/> + stroke="#eb6f92"/> @@ -52,6 +52,7 @@ props.activity.slice().forEach((d, i) => { d.v = peak === 0 ? 0 : d.total / (peak / 2); if (d.v > 1) d.v = 1; + // TODO: Make Rose Pine const ch = d.date.weekday === 0 || d.date.weekday === 6 ? 275 : 170; const cs = d.v * 100; const cl = 15 + ((1 - d.v) * 80); From 39c05765991583040ed470a9cfecbc0f191a5578 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 19:00:10 -0700 Subject: [PATCH 3/8] Revert "Start admin custom css" This reverts commit 74b52213eec21e9ead7574cdfd1f8cc11022e000. --- CALCKEY.md | 2 +- locales/en-US.yml | 1 - locales/ja-JP.yml | 1 - .../client/src/pages/admin/custom-css.vue | 48 ------------------- 4 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 packages/client/src/pages/admin/custom-css.vue diff --git a/CALCKEY.md b/CALCKEY.md index 4eb418b20b..12723ddc0d 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -10,6 +10,7 @@ - Better intro/onboarding - Fully revamp non-logged-in screen - Personal notes for all accounts +- Admin custom CSS - Non-nyaify cat mode - Timeline filters - "Bubble" timeline @@ -27,7 +28,6 @@ - Less cluttered notification summary - Better timeline top bar -- Admin custom CSS ## Implemented diff --git a/locales/en-US.yml b/locales/en-US.yml index 0088af46d5..7a507d27d4 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -900,7 +900,6 @@ account: "Account" move: "Move" showAds: "Show ads" enterSendsMessage: "Press Return in Messaging to send message (off is Ctrl + Return)" -adminCustomCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause EVERYONE'S clients to stop functioning normally. Please ensure your CSS works properly by testing it in your user settings." _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 1c832e1f7a..4ac0f509cb 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -900,7 +900,6 @@ navbar: "ナビゲーションバー" shuffle: "シャッフル" account: "アカウント" move: "移動" -adminCustomCssWarn: "この設定は、それが何をするものであるかを知っている場合のみ使用してください。不適切な値を入力すると、クライアントが正常に動作しなくなる可能性があります。ユーザー設定でCSSをテストし、正しく動作することを確認してください。" _sensitiveMediaDetection: description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。" diff --git a/packages/client/src/pages/admin/custom-css.vue b/packages/client/src/pages/admin/custom-css.vue deleted file mode 100644 index 65c70dda7d..0000000000 --- a/packages/client/src/pages/admin/custom-css.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - From 430cb7f38be153355e0991a35bce6c5879d74b38 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 19:00:53 -0700 Subject: [PATCH 4/8] .1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9565569793..01a37fb3c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.118.0-calc.b4", + "version": "12.118.0-calc.1.b4", "codename": "indigo", "repository": { "type": "git", From 17edc3f8aaf489a74825b40c11d1a0822fb142c0 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 19:17:47 -0700 Subject: [PATCH 5/8] Add back missing routes --- packages/client/src/router.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index be6d5d0496..968f4393e4 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -93,6 +93,14 @@ export const routes = [{ path: '/theme', name: 'theme', component: page(() => import('./pages/settings/theme.vue')), + }, { + path: '/custom-css', + name: 'custom-css', + component: page(() => import('./pages/settings/custom-css.vue')), + }, { + path: '/account-info', + name: 'account-info', + component: page(() => import('./pages/settings/account-info.vue')), }, { path: '/navbar', name: 'navbar', From bc4a8359a085210d64e8f99fe99fea5636637f29 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 17:00:44 -0700 Subject: [PATCH 6/8] Start admin custom css --- CALCKEY.md | 2 +- locales/en-US.yml | 1 + locales/ja-JP.yml | 1 + .../client/src/pages/admin/custom-css.vue | 48 +++++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 packages/client/src/pages/admin/custom-css.vue diff --git a/CALCKEY.md b/CALCKEY.md index 12723ddc0d..4eb418b20b 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -10,7 +10,6 @@ - Better intro/onboarding - Fully revamp non-logged-in screen - Personal notes for all accounts -- Admin custom CSS - Non-nyaify cat mode - Timeline filters - "Bubble" timeline @@ -28,6 +27,7 @@ - Less cluttered notification summary - Better timeline top bar +- Admin custom CSS ## Implemented diff --git a/locales/en-US.yml b/locales/en-US.yml index 7a507d27d4..0088af46d5 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -900,6 +900,7 @@ account: "Account" move: "Move" showAds: "Show ads" enterSendsMessage: "Press Return in Messaging to send message (off is Ctrl + Return)" +adminCustomCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause EVERYONE'S clients to stop functioning normally. Please ensure your CSS works properly by testing it in your user settings." _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 4ac0f509cb..1c832e1f7a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -900,6 +900,7 @@ navbar: "ナビゲーションバー" shuffle: "シャッフル" account: "アカウント" move: "移動" +adminCustomCssWarn: "この設定は、それが何をするものであるかを知っている場合のみ使用してください。不適切な値を入力すると、クライアントが正常に動作しなくなる可能性があります。ユーザー設定でCSSをテストし、正しく動作することを確認してください。" _sensitiveMediaDetection: description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。" diff --git a/packages/client/src/pages/admin/custom-css.vue b/packages/client/src/pages/admin/custom-css.vue new file mode 100644 index 0000000000..65c70dda7d --- /dev/null +++ b/packages/client/src/pages/admin/custom-css.vue @@ -0,0 +1,48 @@ + + + From 02493c8d089a56de7183103874b1f7632277ca1b Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 19:19:36 -0700 Subject: [PATCH 7/8] Add back admin custom css start --- packages/client/src/router.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index 968f4393e4..c02302fd15 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -356,6 +356,10 @@ export const routes = [{ path: '/other-settings', name: 'other-settings', component: page(() => import('./pages/admin/other-settings.vue')), + }, { + path: '/other-settings', + name: 'other-settings', + component: page(() => import('./pages/admin/custom-css.vue')), }, { path: '/', component: page(() => import('./pages/_empty_.vue')), From bdb4a6321b561276d18492db6cbd47e7fce647e2 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 25 Jul 2022 19:21:32 -0700 Subject: [PATCH 8/8] .3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01a37fb3c8..dde83503d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.118.0-calc.1.b4", + "version": "12.118.0-calc.3.b4", "codename": "indigo", "repository": { "type": "git",