From 955b3e313bbf311dd565d96bc04545c9be96e6bb Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 14 Oct 2021 18:51:15 +0900 Subject: [PATCH 01/17] :art: --- src/client/components/global/header.vue | 5 +- src/client/components/modal-page-window.vue | 3 +- src/client/components/page-window.vue | 3 +- src/client/components/post-form.vue | 14 ++- src/client/pages/page.vue | 112 +++++++++++--------- src/client/pages/timeline.vue | 4 + src/client/ui/deck/column.vue | 14 +-- 7 files changed, 89 insertions(+), 66 deletions(-) diff --git a/src/client/components/global/header.vue b/src/client/components/global/header.vue index 176a1b47ea..a283e1656c 100644 --- a/src/client/components/global/header.vue +++ b/src/client/components/global/header.vue @@ -1,5 +1,5 @@ @@ -214,12 +216,6 @@ export default defineComponent({ diff --git a/src/client/themes/d-botanical.json5 b/src/client/themes/d-botanical.json5 index f3665e22b2..c03b95e2d7 100644 --- a/src/client/themes/d-botanical.json5 +++ b/src/client/themes/d-botanical.json5 @@ -20,7 +20,7 @@ renote: '@accent', mention: 'rgb(212, 153, 76)', mentionMe: 'rgb(212, 210, 76)', - hashtag: 'rgb(76, 212, 180)', + hashtag: '#5bcbb0', link: '@accent', }, } From 46e4b07a87dc3ab62dc6bcaea9278b8c6226e780 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 14 Oct 2021 21:21:10 +0900 Subject: [PATCH 03/17] :art: --- src/client/ui/default.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue index 6fc8cba3c9..69668ff96d 100644 --- a/src/client/ui/default.vue +++ b/src/client/ui/default.vue @@ -80,6 +80,12 @@ export default defineComponent({ XWidgets: defineAsyncComponent(() => import('./default.widgets.vue')), }, + provide() { + return { + shouldHeaderThin: this.showMenuOnTop, + }; + }, + data() { return { pageInfo: null, From 8ee4b180f994a84642995a44e62b405e566b114d Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 14 Oct 2021 22:40:43 +0900 Subject: [PATCH 04/17] :art: --- src/client/components/global/header.vue | 11 +++-------- src/client/ui/deck/column.vue | 3 ++- src/server/web/manifest.json | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/client/components/global/header.vue b/src/client/components/global/header.vue index a283e1656c..492b77b1b4 100644 --- a/src/client/components/global/header.vue +++ b/src/client/components/global/header.vue @@ -1,7 +1,7 @@
diff --git a/src/client/ui/deck/column.vue b/src/client/ui/deck/column.vue index 4f8d1632d9..c04297e384 100644 --- a/src/client/ui/deck/column.vue +++ b/src/client/ui/deck/column.vue @@ -362,7 +362,7 @@ export default defineComponent({ } > .toggleActive, - > .action > *, + > .action > ::v-deep(*), > .menu { z-index: 1; width: var(--deckColumnHeaderHeight); diff --git a/src/client/ui/deck/main-column.vue b/src/client/ui/deck/main-column.vue index 4c1fa255a6..2127444769 100644 --- a/src/client/ui/deck/main-column.vue +++ b/src/client/ui/deck/main-column.vue @@ -2,6 +2,7 @@ From f00d543447b0d5f3e6a391cd795a20509eb49e13 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Oct 2021 02:42:10 +0900 Subject: [PATCH 06/17] =?UTF-8?q?fix(client):=20Deck=20UI=E3=81=AB?= =?UTF-8?q?=E3=81=8A=E3=81=84=E3=81=A6=E3=80=81=E9=87=8D=E3=81=AD=E3=81=9F?= =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=A0=E3=81=AE=E7=89=87=E6=96=B9=E3=82=92?= =?UTF-8?q?=E7=95=B3=E3=82=93=E3=81=A0=E7=8A=B6=E6=85=8B=E3=81=A7=E5=8F=B3?= =?UTF-8?q?=E3=81=AB=E5=87=BA=E3=81=99=E3=81=A8=E8=A1=A8=E7=A4=BA=E3=81=8C?= =?UTF-8?q?=E5=A3=8A=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #7867 --- CHANGELOG.md | 1 + src/client/ui/deck/deck-store.ts | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e1f33fca7..040c807677 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - クライアント: ヘッダーにタブが表示されている状態でタイトルをクリックしたときにタブ選択が表示されるのを修正 - クライアント: ユーザーページのタブが機能していない問題を修正 - クライアント: ピン留めユーザーの設定項目がない問題を修正 +- クライアント: Deck UIにおいて、重ねたカラムの片方を畳んだ状態で右に出すと表示が壊れる問題を修正 - API: 管理者およびモデレーターをブロックできてしまう問題を修正 ## 12.91.0 (2021/09/22) diff --git a/src/client/ui/deck/deck-store.ts b/src/client/ui/deck/deck-store.ts index aa389d7610..6c61bf5539 100644 --- a/src/client/ui/deck/deck-store.ts +++ b/src/client/ui/deck/deck-store.ts @@ -219,10 +219,20 @@ export function stackLeftColumn(id: Column['id']) { export function popRightColumn(id: Column['id']) { let layout = copy(deckStore.state.layout); const i = deckStore.state.layout.findIndex(ids => ids.includes(id)); + const affected = layout[i]; layout = layout.map(ids => ids.filter(_id => _id !== id)); layout.splice(i + 1, 0, [id]); layout = layout.filter(ids => ids.length > 0); deckStore.set('layout', layout); + + const columns = copy(deckStore.state.columns); + for (const column of columns) { + if (affected.includes(column.id)) { + column.active = true; + } + } + deckStore.set('columns', columns); + saveDeck(); } From 056ab675cf4b1c92e728a501ebe13cc5f4086836 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Oct 2021 23:33:27 +0900 Subject: [PATCH 07/17] Revert ":art:" This reverts commit b77167a4a122d8dfce3abdd10e340e56a03ac43c. --- src/client/components/ui/menu.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/client/components/ui/menu.vue b/src/client/components/ui/menu.vue index 88c4ce5b99..d144e65c83 100644 --- a/src/client/components/ui/menu.vue +++ b/src/client/components/ui/menu.vue @@ -170,10 +170,9 @@ export default defineComponent({ left: 0; right: 0; margin: auto; - //width: calc(100% - 16px); - width: 100%; + width: calc(100% - 16px); height: 100%; - //border-radius: 6px; + border-radius: 6px; } > * { From c11c22fc73de4b0a7be6fe3343ef6114baf7e09a Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Oct 2021 23:35:28 +0900 Subject: [PATCH 08/17] :art: --- src/client/components/ui/menu.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/components/ui/menu.vue b/src/client/components/ui/menu.vue index d144e65c83..da24d90170 100644 --- a/src/client/components/ui/menu.vue +++ b/src/client/components/ui/menu.vue @@ -152,7 +152,7 @@ export default defineComponent({ > .item { display: block; position: relative; - padding: 8px 16px; + padding: 8px 18px; width: 100%; box-sizing: border-box; white-space: nowrap; @@ -242,12 +242,12 @@ export default defineComponent({ } > i { - margin-right: 4px; + margin-right: 5px; width: 20px; } > .avatar { - margin-right: 4px; + margin-right: 5px; width: 20px; height: 20px; } From fe62f3508b07cee8332bf52b5acbe5c4a2218490 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Oct 2021 01:15:22 +0900 Subject: [PATCH 09/17] :art: --- src/client/components/ui/super-menu.vue | 4 ++-- src/client/pages/settings/index.vue | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/client/components/ui/super-menu.vue b/src/client/components/ui/super-menu.vue index f43b545fd6..35fc81550d 100644 --- a/src/client/components/ui/super-menu.vue +++ b/src/client/components/ui/super-menu.vue @@ -65,8 +65,8 @@ export default defineComponent({ align-items: center; width: 100%; box-sizing: border-box; - padding: 10px 16px 10px 14px; - border-radius: 999px; + padding: 10px 16px 10px 8px; + border-radius: 9px; font-size: 0.9em; &:hover { diff --git a/src/client/pages/settings/index.vue b/src/client/pages/settings/index.vue index cc3fd44f70..bdcadfb955 100644 --- a/src/client/pages/settings/index.vue +++ b/src/client/pages/settings/index.vue @@ -271,6 +271,12 @@ export default defineComponent({ diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index 3b8db21099..7b4c5db46b 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -17,7 +17,7 @@ - +
@@ -41,7 +41,7 @@ - +