diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index ac2b1b4d358a..acb04bd26e03 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE: misskey/misskey + REGISTRY_IMAGE: pernucia/pern-custom-misskey jobs: # see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners @@ -20,7 +20,7 @@ jobs: platform: - linux/amd64 - linux/arm64 - if: github.repository == 'misskey-dev/misskey' + if: github.repository == 'pernucia/pern-custom-misskey' steps: - name: Prepare run: | diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index db899ba386be..9900540379ad 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: env: - REGISTRY_IMAGE: misskey/misskey + REGISTRY_IMAGE: pernucia/pern-custom-misskey TAGS: | type=edge type=ref,event=pr diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 9f32969a79c3..b58832ee3aff 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -2274,6 +2274,7 @@ _widgets: chooseList: "リストを選択" clicker: "クリッカー" birthdayFollowings: "今日誕生日のユーザー" + paplin: "Papline" _cw: hide: "隠す" diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index 97c765d81c73..86dbc01f5726 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -38,12 +38,12 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
diff --git a/packages/frontend/src/components/MkWidgets.vue b/packages/frontend/src/components/MkWidgets.vue index ba619f606314..ecd598f06576 100644 --- a/packages/frontend/src/components/MkWidgets.vue +++ b/packages/frontend/src/components/MkWidgets.vue @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- + {{ i18n.ts.add }} {{ i18n.ts.close }} diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 8dfeb6d2a73e..e136196e66d1 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -10,9 +10,9 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -54,11 +54,13 @@ const headerActions = computed(() => []); const headerTabs = computed(() => [{ key: 'overview', title: i18n.ts.overview, -}, { - key: 'emojis', - title: i18n.ts.customEmojis, - icon: 'ti ti-icons', -}, { +}, +// { +// key: 'emojis', +// title: i18n.ts.customEmojis, +// icon: 'ti ti-icons', +// }, +{ key: 'federation', title: i18n.ts.federation, icon: 'ti ti-whirl', diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue index f0e4a852c971..5a8283b828da 100644 --- a/packages/frontend/src/pages/welcome.entrance.a.vue +++ b/packages/frontend/src/pages/welcome.entrance.a.vue @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -33,6 +33,10 @@ const widgetPropsDef = { type: 'number' as const, default: 300, }, + fullImageMode: { + type: 'boolean' as const, + default: false, + }, folderId: { type: 'string' as const, default: null, @@ -158,6 +162,11 @@ defineExpose({ opacity: 1; } } + > .full-image { + background-size: contain; + background-repeat: no-repeat; + background-color: transparent; + } } } diff --git a/packages/frontend/src/widgets/WidgetSpinner.vue b/packages/frontend/src/widgets/WidgetSpinner.vue new file mode 100644 index 000000000000..5d5da8c611da --- /dev/null +++ b/packages/frontend/src/widgets/WidgetSpinner.vue @@ -0,0 +1,86 @@ + + + + + + + diff --git a/packages/frontend/src/widgets/index.ts b/packages/frontend/src/widgets/index.ts index e269fcf9eb89..9f7de8bf3a69 100644 --- a/packages/frontend/src/widgets/index.ts +++ b/packages/frontend/src/widgets/index.ts @@ -34,6 +34,9 @@ export default function(app: App) { app.component('WidgetUserList', defineAsyncComponent(() => import('./WidgetUserList.vue'))); app.component('WidgetClicker', defineAsyncComponent(() => import('./WidgetClicker.vue'))); app.component('WidgetBirthdayFollowings', defineAsyncComponent(() => import('./WidgetBirthdayFollowings.vue'))); + app.component('WidgetPaplin', defineAsyncComponent(() => import('./WidgetPaplin.vue'))); + app.component('WidgetKordle', defineAsyncComponent(() => import('./WidgetKordle.vue'))); + app.component('WidgetSpinner', defineAsyncComponent(() => import('./WidgetSpinner.vue'))); } export const widgets = [ @@ -65,4 +68,7 @@ export const widgets = [ 'userList', 'clicker', 'birthdayFollowings', + 'paplin', + 'kordle', + 'spinner', ];