diff options
| author | あずき⪥™ <44765629+melt-adzuki@users.noreply.github.com> | 2023-01-10 19:53:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-10 19:53:33 +0900 |
| commit | 7761eb8897cbffa00eff0793f5a2e7a1a7a09bbb (patch) | |
| tree | cd0e9189427ca7e1622e1787c78add526adb7141 | |
| parent | enhance(server): アンケート選択肢の文字数制限を緩和 (diff) | |
| download | sharkey-7761eb8897cbffa00eff0793f5a2e7a1a7a09bbb.tar.gz sharkey-7761eb8897cbffa00eff0793f5a2e7a1a7a09bbb.tar.bz2 sharkey-7761eb8897cbffa00eff0793f5a2e7a1a7a09bbb.zip | |
prefer using composition (#9521)
| -rw-r--r-- | packages/frontend/src/ui/deck.vue | 6 | ||||
| -rw-r--r-- | packages/frontend/src/ui/universal.vue | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue index 461396dafb..8479aaa77b 100644 --- a/packages/frontend/src/ui/deck.vue +++ b/packages/frontend/src/ui/deck.vue @@ -9,7 +9,7 @@ <!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため --> <section v-if="ids.length > 1" - :class="[$style.column, $style.folder]" + :class="$style.folder" :style="columns.filter(c => ids.includes(c.id)).some(c => c.flexible) ? { flex: 1, minWidth: '350px' } : { width: Math.max(...columns.filter(c => ids.includes(c.id)).map(c => c.width)) + 'px' }" > <DeckColumnCore v-for="id in ids" :ref="id" :key="id" :column="columns.find(c => c.id === id)" :is-stacked="true" @parent-focus="moveFocus(id, $event)"/> @@ -49,7 +49,7 @@ <button :class="$style.navButton" class="_button" @click="drawerMenuShowing = true"><i :class="$style.navButtonIcon" class="ti ti-menu-2"></i><span v-if="menuIndicated" :class="$style.navButtonIndicator"><i class="_indicatorCircle"></i></span></button> <button :class="$style.navButton" class="_button" @click="mainRouter.push('/')"><i :class="$style.navButtonIcon" class="ti ti-home"></i></button> <button :class="$style.navButton" class="_button" @click="mainRouter.push('/my/notifications')"><i :class="$style.navButtonIcon" class="ti ti-bell"></i><span v-if="$i?.hasUnreadNotification" :class="$style.navButtonIndicator"><i class="_indicatorCircle"></i></span></button> - <button :class="[$style.navButton, $style.postButton]" class="_button" @click="os.post()"><i :class="$style.navButtonIcon" class="ti ti-pencil"></i></button> + <button :class="$style.postButton" class="_button" @click="os.post()"><i :class="$style.navButtonIcon" class="ti ti-pencil"></i></button> </div> <Transition :name="$store.state.animation ? 'menu-back' : ''"> @@ -298,6 +298,7 @@ async function deleteProfile() { } .folder { + composes: column; display: flex; flex-direction: column; @@ -402,6 +403,7 @@ async function deleteProfile() { } .postButton { + composes: navButton; background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB)); color: var(--fgOnAccent); } diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue index 00e65ebee0..503a25cbad 100644 --- a/packages/frontend/src/ui/universal.vue +++ b/packages/frontend/src/ui/universal.vue @@ -23,7 +23,7 @@ <button :class="$style.navButton" class="_button" @click="mainRouter.currentRoute.value.name === 'index' ? top() : mainRouter.push('/')"><i :class="$style.navButtonIcon" class="ti ti-home"></i></button> <button :class="$style.navButton" class="_button" @click="mainRouter.push('/my/notifications')"><i :class="$style.navButtonIcon" class="ti ti-bell"></i><span v-if="$i?.hasUnreadNotification" :class="$style.navButtonIndicator"><i class="_indicatorCircle"></i></span></button> <button :class="$style.navButton" class="_button" @click="widgetsShowing = true"><i :class="$style.navButtonIcon" class="ti ti-apps"></i></button> - <button :class="[$style.navButton, $style.postButton]" class="_button" @click="os.post()"><i :class="$style.navButtonIcon" class="ti ti-pencil"></i></button> + <button :class="$style.postButton" class="_button" @click="os.post()"><i :class="$style.navButtonIcon" class="ti ti-pencil"></i></button> </div> <Transition @@ -350,6 +350,7 @@ $widgets-hide-threshold: 1090px; } .postButton { + composes: navButton; background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB)); color: var(--fgOnAccent); } |