diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2021-02-20 21:02:59 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2021-02-20 21:02:59 +0900 |
| commit | 9860489f88e04722202d0596e1a7304edb4cb82b (patch) | |
| tree | b2675b7ac82930382635387da6dccdfdd51fcab8 /src/client | |
| parent | チャンネルで入力中ユーザーを表示するように、Chat UIで... (diff) | |
| download | misskey-9860489f88e04722202d0596e1a7304edb4cb82b.tar.gz misskey-9860489f88e04722202d0596e1a7304edb4cb82b.tar.bz2 misskey-9860489f88e04722202d0596e1a7304edb4cb82b.zip | |
Fix style
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/components/notes.vue | 11 | ||||
| -rw-r--r-- | src/client/ui/chat/notes.vue | 11 | ||||
| -rw-r--r-- | src/client/ui/chat/timeline.vue | 4 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index bd6d5bb4f5..ebb87622af 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -8,10 +8,10 @@ <MkError v-if="error" @retry="init()"/> <div v-show="more && reversed" style="margin-bottom: var(--margin);"> - <button class="_buttonPrimary" @click="fetchMoreFeature" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> + <MkButton class="_buttonPrimary" style="margin: 0 auto;" @click="fetchMoreFeature" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">{{ $ts.loadMore }}</template> <template v-if="moreFetching"><MkLoading inline/></template> - </button> + </MkButton> </div> <XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed"> @@ -19,10 +19,10 @@ </XList> <div v-show="more && !reversed" style="margin-top: var(--margin);"> - <button class="_buttonPrimary" v-appear="$store.state.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> + <MkButton class="_buttonPrimary" style="margin: 0 auto;" v-appear="$store.state.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">{{ $ts.loadMore }}</template> <template v-if="moreFetching"><MkLoading inline/></template> - </button> + </MkButton> </div> </div> </template> @@ -32,10 +32,11 @@ import { defineComponent } from 'vue'; import paging from '@/scripts/paging'; import XNote from './note.vue'; import XList from './date-separated-list.vue'; +import MkButton from '@/components/ui/button.vue'; export default defineComponent({ components: { - XNote, XList, + XNote, XList, MkButton, }, mixins: [ diff --git a/src/client/ui/chat/notes.vue b/src/client/ui/chat/notes.vue index 1fa2870cee..774b8e4aa3 100644 --- a/src/client/ui/chat/notes.vue +++ b/src/client/ui/chat/notes.vue @@ -8,10 +8,10 @@ <MkError v-if="error" @retry="init()"/> <div v-show="more && reversed" style="margin-bottom: var(--margin);"> - <button class="_buttonPrimary" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> + <MkButton class="_buttonPrimary" style="margin: 0 auto;" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">{{ $ts.loadMore }}</template> <template v-if="moreFetching"><MkLoading inline/></template> - </button> + </MkButton> </div> <XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed"> @@ -19,10 +19,10 @@ </XList> <div v-show="more && !reversed" style="margin-top: var(--margin);"> - <button class="_buttonPrimary" v-appear="$store.state.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> + <MkButton class="_buttonPrimary" style="margin: 0 auto;" v-appear="$store.state.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">{{ $ts.loadMore }}</template> <template v-if="moreFetching"><MkLoading inline/></template> - </button> + </MkButton> </div> </div> </template> @@ -32,10 +32,11 @@ import { defineComponent } from 'vue'; import paging from '@/scripts/paging'; import XNote from './note.vue'; import XList from './date-separated-list.vue'; +import MkButton from '@/components/ui/button.vue'; export default defineComponent({ components: { - XNote, XList, + XNote, XList, MkButton, }, mixins: [ diff --git a/src/client/ui/chat/timeline.vue b/src/client/ui/chat/timeline.vue index 12cb7af7d2..2a74584e65 100644 --- a/src/client/ui/chat/timeline.vue +++ b/src/client/ui/chat/timeline.vue @@ -221,9 +221,8 @@ export default defineComponent({ queueUpdated(q) { if (this.$refs.body.offsetWidth !== 0) { const rect = this.$refs.body.getBoundingClientRect(); - const scrollTop = getScrollPosition(this.$refs.body); this.width = this.$refs.body.offsetWidth; - this.top = rect.top + scrollTop; + this.top = rect.top; this.bottom = this.$refs.body.offsetHeight; } this.queue = q; @@ -264,6 +263,7 @@ export default defineComponent({ } .dbiokgaf.tl { + position: relative; padding: 16px 0; flex: 1; min-width: 0; |