diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2023-04-01 13:46:54 +0900 |
|---|---|---|
| committer | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2023-04-01 13:46:54 +0900 |
| commit | 2b831da1d1e53823cfbc85b513095e9af69fc28a (patch) | |
| tree | 3d3e1ca4cc61b778c6103b912545c46fbedfab49 /packages/frontend/src/components/global | |
| parent | build(#10336): generate `components/global` stories only (diff) | |
| parent | refactor(frontend): remove $instance (diff) | |
| download | misskey-2b831da1d1e53823cfbc85b513095e9af69fc28a.tar.gz misskey-2b831da1d1e53823cfbc85b513095e9af69fc28a.tar.bz2 misskey-2b831da1d1e53823cfbc85b513095e9af69fc28a.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into storybook
Diffstat (limited to 'packages/frontend/src/components/global')
| -rw-r--r-- | packages/frontend/src/components/global/MkAcct.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/components/global/MkError.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/components/global/MkPageHeader.vue | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/packages/frontend/src/components/global/MkAcct.vue b/packages/frontend/src/components/global/MkAcct.vue index 6d68072c07..2b9f892fc6 100644 --- a/packages/frontend/src/components/global/MkAcct.vue +++ b/packages/frontend/src/components/global/MkAcct.vue @@ -1,7 +1,7 @@ <template> <span> <span>@{{ user.username }}</span> - <span v-if="user.host || detail || showFullAcct" style="opacity: 0.5;">@{{ user.host || host }}</span> + <span v-if="user.host || detail || defaultStore.state.showFullAcct" style="opacity: 0.5;">@{{ user.host || host }}</span> </span> </template> @@ -17,5 +17,4 @@ defineProps<{ }>(); const host = toUnicode(hostRaw); -const showFullAcct = $ref(defaultStore.state.showFullAcct); </script> diff --git a/packages/frontend/src/components/global/MkError.vue b/packages/frontend/src/components/global/MkError.vue index bb3dc82cb4..513ef21d35 100644 --- a/packages/frontend/src/components/global/MkError.vue +++ b/packages/frontend/src/components/global/MkError.vue @@ -1,5 +1,5 @@ <template> -<Transition :name="animation ? '_transition_zoom' : ''" appear> +<Transition :name="defaultStore.state.animation ? '_transition_zoom' : ''" appear> <div :class="$style.root"> <img :class="$style.img" src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/> <p :class="$style.text"><i class="ti ti-alert-triangle"></i> {{ i18n.ts.somethingHappened }}</p> @@ -13,7 +13,6 @@ import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; import { defaultStore } from '@/store'; -const animation = $ref(defaultStore.reactiveState.animation); const emit = defineEmits<{ (ev: 'retry'): void; }>(); diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue index 4d968db6a3..0d229a9370 100644 --- a/packages/frontend/src/components/global/MkPageHeader.vue +++ b/packages/frontend/src/components/global/MkPageHeader.vue @@ -241,7 +241,7 @@ onUnmounted(() => { display: flex; align-items: center; max-width: min(30vw, 400px); - overflow: auto; + overflow: clip; white-space: nowrap; text-align: left; font-weight: bold; |