From cafbf6c4144f17abf12357152bf202ca75c04e36 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 20 Jan 2024 03:04:08 +0900 Subject: [PATCH] refactor (client): organize CSS properties & improve RTL layout support Co-authored-by: sup39 --- .../client/src/components/MkAnnouncement.vue | 5 ++- .../client/src/components/MkAutocomplete.vue | 20 ++++++++--- .../src/components/MkChannelFollowButton.vue | 5 ++- .../client/src/components/MkChatPreview.vue | 17 +++++++--- packages/client/src/components/MkDialog.vue | 4 +-- packages/client/src/components/MkDonation.vue | 7 ++-- .../client/src/components/MkDrive.file.vue | 4 +-- .../client/src/components/MkDrive.folder.vue | 2 +- .../client/src/components/MkEmojiPicker.vue | 2 +- packages/client/src/components/MkFolder.vue | 10 ++++-- .../client/src/components/MkFollowButton.vue | 5 ++- .../client/src/components/MkInstanceStats.vue | 15 ++++++--- packages/client/src/components/MkKeyValue.vue | 7 ++-- .../client/src/components/MkLaunchPad.vue | 2 +- .../src/components/MkManyAnnouncements.vue | 2 +- .../client/src/components/MkMediaCaption.vue | 2 +- packages/client/src/components/MkMention.vue | 10 ++++-- packages/client/src/components/MkMenu.vue | 2 +- packages/client/src/components/MkNote.vue | 12 +++++-- .../client/src/components/MkNoteDetailed.vue | 2 +- .../client/src/components/MkNoteHeader.vue | 15 +++++++-- .../client/src/components/MkNotePreview.vue | 15 +++++++-- .../client/src/components/MkNoteSimple.vue | 15 +++++++-- packages/client/src/components/MkNoteSub.vue | 15 +++++++-- .../client/src/components/MkPollEditor.vue | 4 +-- packages/client/src/components/MkPostForm.vue | 33 ++++++++++++++----- .../src/components/MkPostFormDialog.vue | 2 +- .../components/MkReactionsViewer.reaction.vue | 5 ++- .../client/src/components/MkSearchBox.vue | 2 +- packages/client/src/components/MkSignin.vue | 2 +- .../src/components/MkSubNoteContent.vue | 4 +-- .../client/src/components/MkSuperMenu.vue | 12 +++++-- packages/client/src/components/MkUpdated.vue | 2 +- .../client/src/components/form/checkbox.vue | 2 +- .../client/src/components/form/folder.vue | 2 +- packages/client/src/components/form/input.vue | 6 ++-- .../client/src/components/form/radios.vue | 4 +-- packages/client/src/components/form/range.vue | 4 +-- .../client/src/components/form/section.vue | 2 +- .../client/src/components/form/select.vue | 4 +-- packages/client/src/components/form/slot.vue | 4 +-- .../client/src/components/form/switch.vue | 2 +- .../client/src/components/form/textarea.vue | 6 ++-- .../client/src/components/global/MkError.vue | 2 +- .../src/components/page/page.section.vue | 6 ++-- packages/client/src/pages/_error_.vue | 2 +- packages/client/src/pages/about-firefish.vue | 2 +- packages/client/src/pages/about.emojis.vue | 7 ++-- packages/client/src/pages/about.vue | 2 +- packages/client/src/pages/admin/emojis.vue | 10 ++++-- .../client/src/pages/admin/overview.queue.vue | 2 +- packages/client/src/pages/emojis.emoji.vue | 5 ++- packages/client/src/pages/follow-requests.vue | 5 ++- packages/client/src/pages/gallery/post.vue | 9 +++-- packages/client/src/pages/instance-info.vue | 7 ++-- packages/client/src/pages/messaging/index.vue | 2 +- .../pages/messaging/messaging-room.form.vue | 2 +- .../messaging/messaging-room.message.vue | 2 +- .../src/pages/messaging/messaging-room.vue | 2 +- packages/client/src/pages/my-groups/index.vue | 2 +- packages/client/src/pages/no-graze.vue | 2 +- .../page-editor/els/page-editor.el.button.vue | 2 +- .../els/page-editor.el.counter.vue | 2 +- .../page-editor/els/page-editor.el.if.vue | 2 +- .../els/page-editor.el.number-input.vue | 2 +- .../page-editor/els/page-editor.el.switch.vue | 2 +- .../els/page-editor.el.text-input.vue | 2 +- .../page-editor/page-editor.container.vue | 4 +-- .../page-editor/page-editor.script-block.vue | 2 +- .../src/pages/page-editor/page-editor.vue | 6 ++-- packages/client/src/pages/page.vue | 7 ++-- .../client/src/pages/settings/accounts.vue | 5 ++- packages/client/src/pages/settings/apps.vue | 5 ++- packages/client/src/pages/settings/index.vue | 2 +- .../client/src/pages/settings/profile.vue | 2 +- .../client/src/pages/settings/reaction.vue | 2 +- packages/client/src/pages/user-info.vue | 2 +- packages/client/src/pages/user/home.vue | 17 +++++++--- .../client/src/pages/welcome.entrance.a.vue | 17 +++++++--- .../client/src/pages/welcome.entrance.b.vue | 2 +- .../client/src/pages/welcome.entrance.c.vue | 2 +- .../client/src/pages/welcome.timeline.vue | 10 ++++-- packages/client/src/style.scss | 2 +- .../src/ui/_common_/navbar-for-mobile.vue | 2 +- packages/client/src/ui/_common_/navbar.vue | 4 +-- packages/client/src/ui/_common_/upload.vue | 12 +++++-- packages/client/src/ui/universal.vue | 2 +- packages/client/src/ui/visitor/a.vue | 2 +- packages/client/src/ui/visitor/header.vue | 5 ++- packages/client/src/ui/visitor/kanban.vue | 4 +-- packages/client/src/widgets/calendar.vue | 7 ++-- packages/client/src/widgets/server-info.vue | 5 ++- 92 files changed, 350 insertions(+), 160 deletions(-) diff --git a/packages/client/src/components/MkAnnouncement.vue b/packages/client/src/components/MkAnnouncement.vue index 4f26cd8ba..4359b31d2 100644 --- a/packages/client/src/components/MkAnnouncement.vue +++ b/packages/client/src/components/MkAnnouncement.vue @@ -82,6 +82,9 @@ const gotIt = () => { } .gotIt { - margin: 1rem 0 1rem 2rem; + margin-top: 1rem; + margin-bottom: 1rem; + margin-inline-start: 2rem; + margin-inline-end: 0; } diff --git a/packages/client/src/components/MkAutocomplete.vue b/packages/client/src/components/MkAutocomplete.vue index 3a97f4584..465e433a4 100644 --- a/packages/client/src/components/MkAutocomplete.vue +++ b/packages/client/src/components/MkAutocomplete.vue @@ -526,19 +526,28 @@ onBeforeUnmount(() => { min-height: 28px; max-width: 28px; max-height: 28px; - margin: 0 8px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 8px; border-radius: 100%; } .name { - margin: 0 8px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 8px; } } > .emojis > li { .emoji { display: inline-block; - margin: 0 4px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 4px; width: 24px; > img { @@ -548,7 +557,10 @@ onBeforeUnmount(() => { } .alias { - margin: 0 0 0 8px; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 8px; + margin-inline-end: 0; } } diff --git a/packages/client/src/components/MkChannelFollowButton.vue b/packages/client/src/components/MkChannelFollowButton.vue index b9a20e4b3..cd1d17264 100644 --- a/packages/client/src/components/MkChannelFollowButton.vue +++ b/packages/client/src/components/MkChannelFollowButton.vue @@ -79,7 +79,10 @@ async function onClick() { background: #fff; &.full { - padding: 0 8px 0 12px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 12px; + padding-inline-end: 8px; font-size: 14px; } diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue index e705fda4b..320012654 100644 --- a/packages/client/src/components/MkChatPreview.vue +++ b/packages/client/src/components/MkChatPreview.vue @@ -136,7 +136,10 @@ function isMe(message): boolean { } > .time { - margin: 0 0 0 auto; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: auto; + margin-inline-end: 0; } } @@ -144,7 +147,10 @@ function isMe(message): boolean { float: left; width: 54px; height: 54px; - margin: 0 16px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 16px; border-radius: 8px; transition: all 0.1s ease; } @@ -152,7 +158,7 @@ function isMe(message): boolean { > .body { > .text { display: block; - margin: 0 0 0 0; + margin: 0; padding: 0; overflow: hidden; overflow-wrap: break-word; @@ -180,7 +186,10 @@ function isMe(message): boolean { font-size: 0.9em; > .avatar { - margin: 0 12px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 12px; } } } diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue index ed920f897..62fb5e474 100644 --- a/packages/client/src/components/MkDialog.vue +++ b/packages/client/src/components/MkDialog.vue @@ -543,7 +543,7 @@ onBeforeUnmount(() => { } .title { - margin: 0 0 8px 0; + margin: 0 0 8px; font-weight: bold; font-size: 1.1em; @@ -553,7 +553,7 @@ onBeforeUnmount(() => { } .text { - margin: 16px 0 0 0; + margin: 16px 0 0; } .buttons { diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue index 095dd7a14..6b3b9e693 100644 --- a/packages/client/src/components/MkDonation.vue +++ b/packages/client/src/components/MkDonation.vue @@ -171,7 +171,10 @@ function openExternal(link) { } .main { - padding: 25px 25px 25px 0; + padding-top: 25px; + padding-bottom: 25px; + padding-inline-start: 0; + padding-inline-end: 25px; flex: 1; } @@ -186,6 +189,6 @@ function openExternal(link) { font-weight: bold; } .text { - margin: 0.7em 0 1em 0; + margin: 0.7em 0 1em; } diff --git a/packages/client/src/components/MkDrive.file.vue b/packages/client/src/components/MkDrive.file.vue index fce7646e7..ff631b12c 100644 --- a/packages/client/src/components/MkDrive.file.vue +++ b/packages/client/src/components/MkDrive.file.vue @@ -229,7 +229,7 @@ async function deleteFile() { diff --git a/packages/client/src/components/MkMediaCaption.vue b/packages/client/src/components/MkMediaCaption.vue index 8cfe18260..10558be1d 100644 --- a/packages/client/src/components/MkMediaCaption.vue +++ b/packages/client/src/components/MkMediaCaption.vue @@ -234,7 +234,7 @@ export default defineComponent({ margin: auto; > header { - margin: 0 0 8px 0; + margin: 0 0 8px; position: relative; > .title { diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue index fccfa2f2a..2e412f435 100644 --- a/packages/client/src/components/MkMention.vue +++ b/packages/client/src/components/MkMention.vue @@ -61,7 +61,10 @@ const isMe = .mention { position: relative; display: inline-block; - padding: 2px 8px 2px 2px; + padding-top: 2px; + padding-bottom: 2px; + padding-inline-start: 2px; + padding-inline-end: 8px; margin-block: 2px; border-radius: 999px; max-width: 100%; @@ -88,7 +91,10 @@ const isMe = width: 1.5em; height: 1.5em; object-fit: cover; - margin: 0 0.2em 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 0.2em; vertical-align: bottom; border-radius: 100%; } diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue index 33eb677ba..f08f22b3f 100644 --- a/packages/client/src/components/MkMenu.vue +++ b/packages/client/src/components/MkMenu.vue @@ -515,7 +515,7 @@ onBeforeUnmount(() => { } &.asDrawer { - padding: 12px 0 calc(env(safe-area-inset-bottom, 0px) + 12px) 0; + padding: 12px 0 calc(env(safe-area-inset-bottom, 0px) + 12px); width: 100%; border-radius: 24px; border-bottom-right-radius: 0; diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 06d5d391c..e51a06460 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -730,7 +730,7 @@ defineExpose({ .note-context { position: relative; - padding: 0 32px 0 32px; + padding: 0 32px; display: flex; z-index: 1; &:first-child { @@ -879,7 +879,10 @@ defineExpose({ > .avatar { flex-shrink: 0; display: block; - margin: 0 14px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 14px; width: var(--avatarSize); height: var(--avatarSize); position: relative; @@ -976,7 +979,10 @@ defineExpose({ > .count { display: inline; - margin: 0 0 0 8px; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 8px; + margin-inline-end: 0; opacity: 0.7; } diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index f74121b20..bd5058e63 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -648,7 +648,7 @@ onUnmounted(() => { } > :deep(.note-container) { - padding: 12px 0 0 0; + padding: 12px 0 0; font-size: 1.05rem; > .header > .body { padding-inline-start: 10px; diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue index ef6b82b65..1134864e8 100644 --- a/packages/client/src/components/MkNoteHeader.vue +++ b/packages/client/src/components/MkNoteHeader.vue @@ -132,7 +132,10 @@ function openServerInfo() { .name { // flex: 1 1 0px; display: inline; - margin: 0 0.5em 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 0.5em; padding: 0; overflow: hidden; font-weight: bold; @@ -142,7 +145,10 @@ function openServerInfo() { .mkusername > .is-bot { flex-shrink: 0; align-self: center; - margin: 0 0.5em 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 0.5em; padding: 1px 6px; font-size: 80%; border: solid 0.5px var(--divider); @@ -156,7 +162,10 @@ function openServerInfo() { .username { display: inline; - margin: 0 0.5em 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 0.5em; overflow: hidden; text-overflow: ellipsis; align-self: flex-start; diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue index 1c0e69541..5b8594148 100644 --- a/packages/client/src/components/MkNotePreview.vue +++ b/packages/client/src/components/MkNotePreview.vue @@ -37,7 +37,10 @@ defineProps<{ &.min-width_350px { > .avatar { - margin: 0 10px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 10px; width: 44px; height: 44px; } @@ -45,7 +48,10 @@ defineProps<{ &.min-width_500px { > .avatar { - margin: 0 12px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 12px; width: 48px; height: 48px; } @@ -54,7 +60,10 @@ defineProps<{ > .avatar { flex-shrink: 0; display: block; - margin: 0 10px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 10px; width: 40px; height: 40px; border-radius: 8px; diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue index 70ee62bf2..75dc8219b 100644 --- a/packages/client/src/components/MkNoteSimple.vue +++ b/packages/client/src/components/MkNoteSimple.vue @@ -31,7 +31,10 @@ defineProps<{ &.min-width_350px { > .avatar { - margin: 0 10px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 10px; width: 44px; height: 44px; } @@ -39,7 +42,10 @@ defineProps<{ &.min-width_500px { > .avatar { - margin: 0 12px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 12px; width: 48px; height: 48px; } @@ -48,7 +54,10 @@ defineProps<{ > .avatar { flex-shrink: 0; display: block; - margin: 0 10px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 10px; width: 40px; height: 40px; border-radius: 8px; diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 72ce89e76..7d5090526 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -482,13 +482,19 @@ function noteClick(e) { padding: 16px 32px; outline: none; &.children { - padding: 10px 0 0 var(--indent); + padding-top: 10px; + padding-bottom: 0; + padding-inline-start: var(--indent); + padding-inline-end: 0; padding-inline-start: var(--indent) !important; font-size: 1em; cursor: auto; &.max-width_500px { - padding: 10px 0 0 8px; + padding-top: 10px; + padding-bottom: 0; + padding-inline-start: 8px; + padding-inline-end: 0; } } @@ -581,7 +587,10 @@ function noteClick(e) { > .count { display: inline; - margin: 0 0 0 8px; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 8px; + margin-inline-end: 0; opacity: 0.7; } diff --git a/packages/client/src/components/MkPollEditor.vue b/packages/client/src/components/MkPollEditor.vue index fa5b4a117..3168b0f55 100644 --- a/packages/client/src/components/MkPollEditor.vue +++ b/packages/client/src/components/MkPollEditor.vue @@ -190,7 +190,7 @@ watch( padding: 8px 16px; > .caution { - margin: 0 0 8px 0; + margin: 0 0 8px; font-size: 0.8em; color: #f00; @@ -228,7 +228,7 @@ watch( } > section { - margin: 16px 0 0 0; + margin: 16px 0 0; > div { margin: 0 8px; diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue index 80a5c4a5b..058f3cd50 100644 --- a/packages/client/src/components/MkPostForm.vue +++ b/packages/client/src/components/MkPostForm.vue @@ -1284,7 +1284,10 @@ onMounted(() => { > .visibility { height: 34px; width: 34px; - margin: 0 0 0 8px; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 8px; + margin-inline-end: 0; & + .localOnly { margin-inline-start: 0 !important; @@ -1296,7 +1299,10 @@ onMounted(() => { } > .local-only { - margin: 0 0 0 12px; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 12px; + margin-inline-end: 0; opacity: 0.7; } @@ -1308,7 +1314,10 @@ onMounted(() => { > .preview { display: inline-block; padding: 0; - margin: 0 8px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 8px; font-size: inherit !important; width: 34px; height: 34px; @@ -1326,7 +1335,10 @@ onMounted(() => { > .submit { display: inline-flex; align-items: center; - margin: 16px 16px 16px 0; + margin-top: 16px; + margin-bottom: 16px; + margin-inline-start: 0; + margin-inline-end: 16px; padding: 0 12px; line-height: 34px; font-weight: bold; @@ -1395,7 +1407,10 @@ onMounted(() => { > span { margin: 0.3rem; - padding: 4px 0 4px 4px; + padding-top: 4px; + padding-bottom: 4px; + padding-inline-start: 4px; + padding-inline-end: 0; border-radius: 999px; background: var(--X3); @@ -1407,7 +1422,7 @@ onMounted(() => { } > .hasNotSpecifiedMentions { - margin: 0 20px 16px 20px; + margin: 0 20px 16px; } > .cw, @@ -1458,7 +1473,7 @@ onMounted(() => { } > footer { - padding: 0 16px 16px 16px; + padding: 0 16px 16px; > button { display: inline-block; @@ -1516,7 +1531,7 @@ onMounted(() => { } > footer { - padding: 0 8px 8px 8px; + padding: 0 8px 8px; } } } @@ -1563,7 +1578,7 @@ onMounted(() => { > .ph-lg { vertical-align: -0.125em; - margin-left: 12px; + margin-inline-start: 12px; } } diff --git a/packages/client/src/components/MkPostFormDialog.vue b/packages/client/src/components/MkPostFormDialog.vue index bb263a12a..f08f02326 100644 --- a/packages/client/src/components/MkPostFormDialog.vue +++ b/packages/client/src/components/MkPostFormDialog.vue @@ -7,7 +7,7 @@ > .count { font-size: 0.9em; line-height: 32px; - margin: 0 0 0 4px; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 4px; + margin-inline-end: 0; } } diff --git a/packages/client/src/components/MkSearchBox.vue b/packages/client/src/components/MkSearchBox.vue index 6d636b0c9..bb61a982d 100644 --- a/packages/client/src/components/MkSearchBox.vue +++ b/packages/client/src/components/MkSearchBox.vue @@ -240,7 +240,7 @@ onBeforeUnmount(() => { } .title { - margin: 0 0 25px 0; + margin: 0 0 25px; font-weight: bold; font-size: 1.3em; } diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue index f849b5046..53d3c3d1b 100644 --- a/packages/client/src/components/MkSignin.vue +++ b/packages/client/src/components/MkSignin.vue @@ -352,7 +352,7 @@ function showSuspendedDialog() { .eppvobhk { > .auth { > .avatar { - margin: 0 auto 0 auto; + margin: 0 auto; width: 64px; height: 64px; background: var(--accentedBg); diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue index ccfd2247e..450476322 100644 --- a/packages/client/src/components/MkSubNoteContent.vue +++ b/packages/client/src/components/MkSubNoteContent.vue @@ -269,7 +269,7 @@ function focusFooter(ev) { .reply-icon { display: inline-block; border-radius: 6px; - padding: 0.2em 0.2em; + padding: 0.2em; margin-inline-end: 0.2em; color: var(--accent); transition: background 0.2s; @@ -303,7 +303,7 @@ function focusFooter(ev) { .reply-icon { display: inline-block; border-radius: 6px; - padding: 0.2em 0.2em; + padding: 0.2em; margin-inline-end: 0.2em; color: var(--accent); transition: background 0.2s; diff --git a/packages/client/src/components/MkSuperMenu.vue b/packages/client/src/components/MkSuperMenu.vue index f761b6192..cbc2d707e 100644 --- a/packages/client/src/components/MkSuperMenu.vue +++ b/packages/client/src/components/MkSuperMenu.vue @@ -91,7 +91,10 @@ export default defineComponent({ align-items: center; width: 100%; box-sizing: border-box; - padding: 10px 16px 10px 8px; + padding-top: 10px; + padding-bottom: 10px; + padding-inline-start: 8px; + padding-inline-end: 16px; border-radius: 9px; font-size: 0.9em; margin-bottom: 0.3rem; @@ -142,7 +145,10 @@ export default defineComponent({ > .title { font-size: 1em; opacity: 0.7; - margin: 0 0 8px 16px; + margin-top: 0; + margin-bottom: 8px; + margin-inline-start: 16px; + margin-inline-end: 0; } > .items { @@ -153,7 +159,7 @@ export default defineComponent({ > .item { flex-direction: column; - padding: 18px 16px 16px 16px; + padding: 18px 16px 16px; background: var(--panel); border-radius: 8px; text-align: center; diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue index f6120bbaf..8fe89654e 100644 --- a/packages/client/src/components/MkUpdated.vue +++ b/packages/client/src/components/MkUpdated.vue @@ -92,7 +92,7 @@ function openReleaseNotes(): void { } .gotIt { - margin: 8px 0 0 0; + margin: 8px 0 0; } .releaseNotes { diff --git a/packages/client/src/components/form/checkbox.vue b/packages/client/src/components/form/checkbox.vue index ed862e681..97217df78 100644 --- a/packages/client/src/components/form/checkbox.vue +++ b/packages/client/src/components/form/checkbox.vue @@ -118,7 +118,7 @@ const toggle = () => { } > .caption { - margin: 8px 0 0 0; + margin: 8px 0 0; color: var(--fgTransparentWeak); font-size: 0.85em; diff --git a/packages/client/src/components/form/folder.vue b/packages/client/src/components/form/folder.vue index 40a61d19c..b28847a84 100644 --- a/packages/client/src/components/form/folder.vue +++ b/packages/client/src/components/form/folder.vue @@ -39,7 +39,7 @@ const opened = ref(props.defaultOpen); align-items: center; width: 100%; box-sizing: border-box; - padding: 12px 14px 12px 14px; + padding: 12px 14px; background: var(--buttonBg); &:hover { diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue index 7a48c8d4f..7c2ff4c4e 100644 --- a/packages/client/src/components/form/input.vue +++ b/packages/client/src/components/form/input.vue @@ -183,7 +183,7 @@ defineExpose({ > label { > .label { font-size: 0.85em; - padding: 0 0 8px 0; + padding: 0 0 8px; user-select: none; &:empty { @@ -193,7 +193,7 @@ defineExpose({ > .caption { font-size: 0.85em; - padding: 8px 0 0 0; + padding: 8px 0 0; color: var(--fgTransparentWeak); &:empty { @@ -292,7 +292,7 @@ defineExpose({ } > .save { - margin: 8px 0 0 0; + margin: 8px 0 0; } } diff --git a/packages/client/src/components/form/radios.vue b/packages/client/src/components/form/radios.vue index a46fecf13..ca81eda22 100644 --- a/packages/client/src/components/form/radios.vue +++ b/packages/client/src/components/form/radios.vue @@ -90,7 +90,7 @@ export default defineComponent({ padding: 0; > .label { font-size: 0.85em; - padding: 0 0 8px 0; + padding: 0 0 8px; user-select: none; &:empty { @@ -106,7 +106,7 @@ export default defineComponent({ > .caption { font-size: 0.85em; - padding: 8px 0 0 0; + padding: 8px 0 0; color: var(--fgTransparentWeak); &:empty { diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue index c7aa7ed77..08b5bec7a 100644 --- a/packages/client/src/components/form/range.vue +++ b/packages/client/src/components/form/range.vue @@ -119,7 +119,7 @@ function tooltipHide() { > .label { font-size: 0.85em; - padding: 0 0 8px 0; + padding: 0 0 8px; user-select: none; &:empty { @@ -129,7 +129,7 @@ function tooltipHide() { > .caption { font-size: 0.85em; - padding: 8px 0 0 0; + padding: 8px 0 0; color: var(--fgTransparentWeak); &:empty { diff --git a/packages/client/src/components/form/section.vue b/packages/client/src/components/form/section.vue index c1d858b53..a92420a93 100644 --- a/packages/client/src/components/form/section.vue +++ b/packages/client/src/components/form/section.vue @@ -28,7 +28,7 @@ > .label { font-weight: bold; - margin: 1.5em 0 16px 0; + margin: 1.5em 0 16px; font-size: 1em; &:empty { diff --git a/packages/client/src/components/form/select.vue b/packages/client/src/components/form/select.vue index a933847ac..6a0c1701d 100644 --- a/packages/client/src/components/form/select.vue +++ b/packages/client/src/components/form/select.vue @@ -203,7 +203,7 @@ function show(ev: MouseEvent) { .vblkjoeq { > .label { font-size: 0.85em; - padding: 0 0 8px 0; + padding: 0 0 8px; user-select: none; &:empty { @@ -213,7 +213,7 @@ function show(ev: MouseEvent) { > .caption { font-size: 0.85em; - padding: 8px 0 0 0; + padding: 8px 0 0; color: var(--fgTransparentWeak); &:empty { diff --git a/packages/client/src/components/form/slot.vue b/packages/client/src/components/form/slot.vue index f570fa60d..a45e08e1a 100644 --- a/packages/client/src/components/form/slot.vue +++ b/packages/client/src/components/form/slot.vue @@ -20,7 +20,7 @@ function focus() { .adhpbeou { > .label { font-size: 0.85em; - padding: 0 0 8px 0; + padding: 0 0 8px; user-select: none; &:empty { @@ -30,7 +30,7 @@ function focus() { > .caption { font-size: 0.85em; - padding: 8px 0 0 0; + padding: 8px 0 0; color: var(--fgTransparentWeak); &:empty { diff --git a/packages/client/src/components/form/switch.vue b/packages/client/src/components/form/switch.vue index d8dd038fa..e38305210 100644 --- a/packages/client/src/components/form/switch.vue +++ b/packages/client/src/components/form/switch.vue @@ -106,7 +106,7 @@ function toggle(x) { } > .caption { - margin: 8px 0 0 0; + margin: 8px 0 0; color: var(--fgTransparentWeak); font-size: 0.85em; diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue index 23197e1d7..13d6cde7d 100644 --- a/packages/client/src/components/form/textarea.vue +++ b/packages/client/src/components/form/textarea.vue @@ -201,7 +201,7 @@ export default defineComponent({ > label { > .label { font-size: 0.85em; - padding: 0 0 8px 0; + padding: 0 0 8px; user-select: none; &:empty { display: none; @@ -209,7 +209,7 @@ export default defineComponent({ } > .caption { font-size: 0.85em; - padding: 8px 0 0 0; + padding: 8px 0 0; color: var(--fgTransparentWeak); &:empty { @@ -276,7 +276,7 @@ export default defineComponent({ } > .save { - margin: 8px 0 0 0; + margin: 8px 0 0; } } diff --git a/packages/client/src/components/global/MkError.vue b/packages/client/src/components/global/MkError.vue index 7472542ee..80feb1c38 100644 --- a/packages/client/src/components/global/MkError.vue +++ b/packages/client/src/components/global/MkError.vue @@ -30,7 +30,7 @@ import icon from "@/scripts/icon"; text-align: center; > p { - margin: 0 0 8px 0; + margin: 0 0 8px; } > .button { diff --git a/packages/client/src/components/page/page.section.vue b/packages/client/src/components/page/page.section.vue index 8f2ae6111..37f647b0e 100644 --- a/packages/client/src/components/page/page.section.vue +++ b/packages/client/src/components/page/page.section.vue @@ -46,17 +46,17 @@ export default defineComponent({ > h2 { font-size: 1.35em; - margin: 0 0 0.5em 0; + margin: 0 0 0.5em; } > h3 { font-size: 1em; - margin: 0 0 0.5em 0; + margin: 0 0 0.5em; } > h4 { font-size: 1em; - margin: 0 0 0.5em 0; + margin: 0 0 0.5em; } // > .children { diff --git a/packages/client/src/pages/_error_.vue b/packages/client/src/pages/_error_.vue index 8d3005f8b..90e7d3574 100644 --- a/packages/client/src/pages/_error_.vue +++ b/packages/client/src/pages/_error_.vue @@ -89,7 +89,7 @@ definePageMetadata({ text-align: center; > p { - margin: 0 0 12px 0; + margin: 0 0 12px; } > .button { diff --git a/packages/client/src/pages/about-firefish.vue b/packages/client/src/pages/about-firefish.vue index 4ae4501ac..2848b4fc0 100644 --- a/packages/client/src/pages/about-firefish.vue +++ b/packages/client/src/pages/about-firefish.vue @@ -314,7 +314,7 @@ definePageMetadata({ } > .misskey { - margin: 0.75em auto 0 auto; + margin: 0.75em auto 0; width: max-content; } diff --git a/packages/client/src/pages/about.emojis.vue b/packages/client/src/pages/about.emojis.vue index 24bd4cf58..9e38e26a6 100644 --- a/packages/client/src/pages/about.emojis.vue +++ b/packages/client/src/pages/about.emojis.vue @@ -143,7 +143,10 @@ export default defineComponent({ > .tags { > .tag { display: inline-block; - margin: 8px 8px 0 0; + margin-top: 8px; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 8px; padding: 4px 8px; font-size: 0.9em; background: var(--accentedBg); @@ -164,7 +167,7 @@ export default defineComponent({ display: grid; grid-template-columns: repeat(auto-fill, minmax(190px, 1fr)); grid-gap: 12px; - margin: 0 var(--margin) var(--margin) var(--margin); + margin: 0 var(--margin) var(--margin); } } } diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue index 92675b4fc..90ea1465a 100644 --- a/packages/client/src/pages/about.vue +++ b/packages/client/src/pages/about.vue @@ -325,7 +325,7 @@ function syncSlide(index) { > .icon { display: block; - margin: 16px auto 0 auto; + margin: 16px auto 0; height: 64px; } diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue index ff4cbc007..b229712f5 100644 --- a/packages/client/src/pages/admin/emojis.vue +++ b/packages/client/src/pages/admin/emojis.vue @@ -480,7 +480,10 @@ definePageMetadata( } > .body { - padding: 0 0 0 8px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 8px; + padding-inline-end: 0; white-space: nowrap; overflow: hidden; @@ -526,7 +529,10 @@ definePageMetadata( } > .body { - padding: 0 0 0 8px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 8px; + padding-inline-end: 0; white-space: nowrap; overflow: hidden; diff --git a/packages/client/src/pages/admin/overview.queue.vue b/packages/client/src/pages/admin/overview.queue.vue index bd5da0695..6268a3878 100644 --- a/packages/client/src/pages/admin/overview.queue.vue +++ b/packages/client/src/pages/admin/overview.queue.vue @@ -114,7 +114,7 @@ onUnmounted(() => { .root { &:global { > .status { - padding: 0 0 16px 0; + padding: 0 0 16px; } > .charts { diff --git a/packages/client/src/pages/emojis.emoji.vue b/packages/client/src/pages/emojis.emoji.vue index bd7e773b6..1c7338564 100644 --- a/packages/client/src/pages/emojis.emoji.vue +++ b/packages/client/src/pages/emojis.emoji.vue @@ -72,7 +72,10 @@ function menu(ev) { } > .body { - padding: 0 0 0 8px; + padding-top: 0; + padding-bottom: 0; + padding-inline-start: 8px; + padding-inline-end: 0; white-space: nowrap; overflow: hidden; diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue index 0f465c5c8..19f7dacb0 100644 --- a/packages/client/src/pages/follow-requests.vue +++ b/packages/client/src/pages/follow-requests.vue @@ -129,7 +129,10 @@ definePageMetadata( > .avatar { display: block; flex-shrink: 0; - margin: 0 12px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 12px; width: 42px; height: 42px; border-radius: 8px; diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue index 37e25e0ad..ddf812c36 100644 --- a/packages/client/src/pages/gallery/post.vue +++ b/packages/client/src/pages/gallery/post.vue @@ -293,7 +293,7 @@ definePageMetadata( display: flex; align-items: center; margin-top: 16px; - padding: 16px 0 0 0; + padding: 16px 0 0; border-top: solid 0.5px var(--divider); > .like { @@ -326,7 +326,7 @@ definePageMetadata( > .user { margin-top: 16px; - padding: 16px 0 0 0; + padding: 16px 0 0; border-top: solid 0.5px var(--divider); display: flex; align-items: center; @@ -337,7 +337,10 @@ definePageMetadata( } > .name { - margin: 0 0 0 12px; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 12px; + margin-inline-end: 0; font-size: 90%; } diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue index bf4637a23..ef28abc2a 100644 --- a/packages/client/src/pages/instance-info.vue +++ b/packages/client/src/pages/instance-info.vue @@ -454,7 +454,10 @@ function syncSlide(index) { > .icon { display: block; - margin: 0 16px 0 0; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 16px; height: 64px; border-radius: 8px; } @@ -467,7 +470,7 @@ function syncSlide(index) { .cmhjzshl { > .selects { display: flex; - margin: 0 0 16px 0; + margin: 0 0 16px; } } diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue index 8b8eb1a9d..d1e64415e 100644 --- a/packages/client/src/pages/messaging/index.vue +++ b/packages/client/src/pages/messaging/index.vue @@ -281,7 +281,7 @@ onUnmounted(() => { diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue index 327b56811..ec32b7d3d 100644 --- a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue +++ b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue @@ -5,7 +5,7 @@ {{ i18n.ts._pages.blocks.counter }} -
+
-
+
-
+
.warn { color: #ea9d34; margin: 0; - padding: 16px 16px 0 16px; + padding: 16px 16px 0; font-size: 14px; } > .error { color: #b4637a; margin: 0; - padding: 16px 16px 0 16px; + padding: 16px 16px 0; font-size: 14px; } diff --git a/packages/client/src/pages/page-editor/page-editor.script-block.vue b/packages/client/src/pages/page-editor/page-editor.script-block.vue index e271fcf79..090620082 100644 --- a/packages/client/src/pages/page-editor/page-editor.script-block.vue +++ b/packages/client/src/pages/page-editor/page-editor.script-block.vue @@ -91,7 +91,7 @@