diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 41cbbbf60e..5f8532c20d 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -36,6 +36,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE - Misskey 2023.10.0 에서 제거된 노트 편집 기능이 계속 유지됩니다. ### General +- Add: Mirerado 테마 추가 ([mirerado-theme](https://mi.rerac.dev/@notify/pages/mirerado-theme)) - Feat: 읽지 않은 알림 수를 표시할 수 있음 (misskey-dev/misskey#11982) - Feat: 햅틱 피드백 개선 - 지원 범위 추가 diff --git a/packages/frontend/.storybook/preload-theme.ts b/packages/frontend/.storybook/preload-theme.ts index b925167e87..be0e980e5e 100644 --- a/packages/frontend/.storybook/preload-theme.ts +++ b/packages/frontend/.storybook/preload-theme.ts @@ -10,6 +10,12 @@ const keys = [ '_dark', '_light', 'l-cherrypick', + 'l-rosepinedawn', + 'l-mirerado', + 'l-byeolvit-polaris', + 'l-scone-color', + 'l-stella-r2', + 'l-birdsite', 'l-light', 'l-coffee', 'l-apricot', @@ -20,6 +26,14 @@ const keys = [ 'l-sushi', 'l-u0', 'd-cherrypick', + 'd-rosepine', + 'd-rosepinemoon', + 'd-mirerado', + 'd-byeolvit-noctiluca', + 'd-scone-color', + 'd-stella-r2', + 'd-qdon', + 'd-birdsite', 'd-dark', 'd-persimmon', 'd-astro', diff --git a/packages/frontend/src/scripts/theme.ts b/packages/frontend/src/scripts/theme.ts index f07fcd1a30..7b6513338c 100644 --- a/packages/frontend/src/scripts/theme.ts +++ b/packages/frontend/src/scripts/theme.ts @@ -26,9 +26,11 @@ export const getBuiltinThemes = () => Promise.all( [ 'l-cherrypick', 'l-rosepinedawn', + 'l-mirerado', 'l-byeolvit-polaris', 'l-scone-color', 'l-stella-r2', + 'l-birdsite', 'l-light', 'l-coffee', 'l-apricot', @@ -38,14 +40,16 @@ export const getBuiltinThemes = () => Promise.all( 'l-cherry', 'l-sushi', 'l-u0', - 'l-birdsite', 'd-cherrypick', 'd-rosepine', 'd-rosepinemoon', + 'd-mirerado', 'd-byeolvit-noctiluca', 'd-scone-color', 'd-stella-r2', + 'd-qdon', + 'd-birdsite', 'd-dark', 'd-persimmon', 'd-astro', @@ -56,8 +60,6 @@ export const getBuiltinThemes = () => Promise.all( 'd-cherry', 'd-ice', 'd-u0', - 'd-qdon', - 'd-birdsite', ].map(name => import(`../themes/${name}.json5`).then(({ default: _default }): Theme => _default)), ); diff --git a/packages/frontend/src/themes/d-mirerado.json5 b/packages/frontend/src/themes/d-mirerado.json5 new file mode 100644 index 0000000000..57727b0cf5 --- /dev/null +++ b/packages/frontend/src/themes/d-mirerado.json5 @@ -0,0 +1,27 @@ +{ + id: 'a8cb5be7-cac8-4aa4-8ec1-c9cc582949ae', + base: 'dark', + name: 'Mirerado Neptune', + author: 'qua.', + desc: '미래를 향하는 꼬마전구, MireRado의 디폴트 다크 테마에요.', + + props: { + bg: '#14131B', + fg: 'rgb(228, 228, 228)', + link: 'rgb(0, 176, 244)', + navBg: '#20202C', + navFg: '#D8DAEC', + panel: '#20202C', + accent: '#666DFE', + header: '#20202C', + renote: '#666DFE', + hashtag: '@accent', + mention: '@accent', + navActive: '#ffffff', + navHoverFg: '#dcddde', + fgHighlighted: '#ffffff', + scrollbarHandle: '#20202C', + cwBg: '#2a2b4b', + cwFg: '#dcddde', + }, +} diff --git a/packages/frontend/src/themes/l-mirerado.json5 b/packages/frontend/src/themes/l-mirerado.json5 new file mode 100644 index 0000000000..ccbb7e99e9 --- /dev/null +++ b/packages/frontend/src/themes/l-mirerado.json5 @@ -0,0 +1,27 @@ +{ + id: '90b3d615-ce4e-416d-82ae-cc11a1228403', + base: 'light', + name: 'Mirerado Uranus', + author: 'qua.', + desc: '미래를 향하는 꼬마전구, MireRado의 디폴트 라이트 테마에요.', + + props: { + bg: '#EAEAEE', + fg: '#4E4E5E', + link: 'rgb(0, 176, 244)', + navBg: '#FAFBFC', + navFg: '#111111', + panel: '#FAFBFC', + accent: '#666DFE', + header: '#FAFBFC', + renote: '#999DFE', + hashtag: '@accent', + mention: '@accent', + navActive: '#111111', + navHoverFg: '#dcddde', + fgHighlighted: '#ffffff', + scrollbarHandle: '#d7d7e1', + cwBg: '#e4e6fc', + cwFg: '#4E4E5E', + }, +}