usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(client): use css modules

This commit is contained in:
syuilo 2023-01-15 11:22:58 +09:00
parent a3832d73fd
commit daddec8362
3 changed files with 146 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
packages/frontend/src/components/MkNotePreview.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<div class="fefdfafb"> <div :class="$style.root">
<MkAvatar class="avatar" :user="$i"/> <MkAvatar :class="$style.avatar" :user="$i"/>
<div class="main"> <div :class="$style.main">
<div class="header"> <div :class="$style.header">
<MkUserName :user="$i"/> <MkUserName :user="$i"/>
</div> </div>
<div class="body"> <div>
<div class="content"> <div :class="$style.content">
<Mfm :text="text.trim()" :author="$i" :i="$i"/> <Mfm :text="text.trim()" :author="$i" :i="$i"/>
</div> </div>
</div> </div>
@ -22,75 +22,48 @@ const props = defineProps<{
}>(); }>();
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.fefdfafb { .root {
display: flex; display: flex;
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow: clip; overflow: clip;
font-size: 0.95em; font-size: 0.95em;
> .avatar {
flex-shrink: 0;
display: block;
margin: 0 10px 0 0;
width: 40px;
height: 40px;
border-radius: 8px;
pointer-events: none;
} }
> .main { .avatar {
flex-shrink: 0 !important;
display: block !important;
margin: 0 10px 0 0 !important;
width: 40px !important;
height: 40px !important;
border-radius: 8px !important;
pointer-events: none !important;
}
.main {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
}
> .header { .header {
margin-bottom: 2px; margin-bottom: 2px;
font-weight: bold; font-weight: bold;
} }
> .body {
> .cw {
cursor: default;
display: block;
margin: 0;
padding: 0;
overflow-wrap: break-word;
> .text {
margin-right: 8px;
}
}
> .content {
> .text {
cursor: default;
margin: 0;
padding: 0;
}
}
}
}
}
@container (min-width: 350px) { @container (min-width: 350px) {
.fefdfafb { .avatar {
> .avatar { margin: 0 10px 0 0 !important;
margin: 0 10px 0 0; width: 44px !important;
width: 44px; height: 44px !important;
height: 44px;
}
} }
} }
@container (min-width: 500px) { @container (min-width: 500px) {
.fefdfafb { .avatar {
> .avatar { margin: 0 12px 0 0 !important;
margin: 0 12px 0 0; width: 48px !important;
width: 48px; height: 48px !important;
height: 48px;
}
} }
} }
</style> </style>

80
packages/frontend/src/components/MkVisibilityPicker.vue
View File

@ -1,42 +1,42 @@
<template> <template>
<MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')"> <MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')">
<div class="gqyayizv _popup"> <div class="_popup" :class="$style.root">
<button key="public" class="_button item" :class="{ active: v === 'public' }" data-index="1" @click="choose('public')"> <button key="public" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')">
<div class="icon"><i class="ti ti-world"></i></div> <div :class="$style.icon"><i class="ti ti-world"></i></div>
<div class="body"> <div :class="$style.body">
<span>{{ i18n.ts._visibility.public }}</span> <span :class="$style.itemTitle">{{ i18n.ts._visibility.public }}</span>
<span>{{ i18n.ts._visibility.publicDescription }}</span> <span :class="$style.itemDescription">{{ i18n.ts._visibility.publicDescription }}</span>
</div> </div>
</button> </button>
<button key="home" class="_button item" :class="{ active: v === 'home' }" data-index="2" @click="choose('home')"> <button key="home" class="_button" :class="[$style.item, { [$style.active]: v === 'home' }]" data-index="2" @click="choose('home')">
<div class="icon"><i class="ti ti-home"></i></div> <div :class="$style.icon"><i class="ti ti-home"></i></div>
<div class="body"> <div :class="$style.body">
<span>{{ i18n.ts._visibility.home }}</span> <span :class="$style.itemTitle">{{ i18n.ts._visibility.home }}</span>
<span>{{ i18n.ts._visibility.homeDescription }}</span> <span :class="$style.itemDescription">{{ i18n.ts._visibility.homeDescription }}</span>
</div> </div>
</button> </button>
<button key="followers" class="_button item" :class="{ active: v === 'followers' }" data-index="3" @click="choose('followers')"> <button key="followers" class="_button" :class="[$style.item, { [$style.active]: v === 'followers' }]" data-index="3" @click="choose('followers')">
<div class="icon"><i class="ti ti-lock"></i></div> <div :class="$style.icon"><i class="ti ti-lock"></i></div>
<div class="body"> <div :class="$style.body">
<span>{{ i18n.ts._visibility.followers }}</span> <span :class="$style.itemTitle">{{ i18n.ts._visibility.followers }}</span>
<span>{{ i18n.ts._visibility.followersDescription }}</span> <span :class="$style.itemDescription">{{ i18n.ts._visibility.followersDescription }}</span>
</div> </div>
</button> </button>
<button key="specified" :disabled="localOnly" class="_button item" :class="{ active: v === 'specified' }" data-index="4" @click="choose('specified')"> <button key="specified" :disabled="localOnly" class="_button" :class="[$style.item, { [$style.active]: v === 'specified' }]" data-index="4" @click="choose('specified')">
<div class="icon"><i class="ti ti-mail"></i></div> <div :class="$style.icon"><i class="ti ti-mail"></i></div>
<div class="body"> <div :class="$style.body">
<span>{{ i18n.ts._visibility.specified }}</span> <span :class="$style.itemTitle">{{ i18n.ts._visibility.specified }}</span>
<span>{{ i18n.ts._visibility.specifiedDescription }}</span> <span :class="$style.itemDescription">{{ i18n.ts._visibility.specifiedDescription }}</span>
</div> </div>
</button> </button>
<div class="divider"></div> <div :class="$style.divider"></div>
<button key="localOnly" class="_button item localOnly" :class="{ active: localOnly }" data-index="5" @click="localOnly = !localOnly"> <button key="localOnly" class="_button" :class="[$style.item, $style.localOnly, { [$style.active]: localOnly }]" data-index="5" @click="localOnly = !localOnly">
<div class="icon"><i class="ti ti-world-off"></i></div> <div :class="$style.icon"><i class="ti ti-world-off"></i></div>
<div class="body"> <div :class="$style.body">
<span>{{ i18n.ts._visibility.localOnly }}</span> <span :class="$style.itemTitle">{{ i18n.ts._visibility.localOnly }}</span>
<span>{{ i18n.ts._visibility.localOnlyDescription }}</span> <span :class="$style.itemDescription">{{ i18n.ts._visibility.localOnlyDescription }}</span>
</div> </div>
<div class="toggle"><i :class="localOnly ? 'ti ti-toggle-right' : 'ti ti-toggle-left'"></i></div> <div :class="$style.toggle"><i :class="localOnly ? 'ti ti-toggle-right' : 'ti ti-toggle-left'"></i></div>
</button> </button>
</div> </div>
</MkModal> </MkModal>
@ -79,17 +79,18 @@ function choose(visibility: typeof misskey.noteVisibilities[number]): void {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.gqyayizv { .root {
width: 240px; width: 240px;
padding: 8px 0; padding: 8px 0;
}
> .divider { .divider {
margin: 8px 0; margin: 8px 0;
border-top: solid 0.5px var(--divider); border-top: solid 0.5px var(--divider);
} }
> .item { .item {
display: flex; display: flex;
padding: 8px 14px; padding: 8px 14px;
font-size: 12px; font-size: 12px;
@ -114,8 +115,9 @@ function choose(visibility: typeof misskey.noteVisibilities[number]): void {
color: var(--accent); color: var(--accent);
background: inherit; background: inherit;
} }
}
> .icon { .icon {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -127,23 +129,23 @@ function choose(visibility: typeof misskey.noteVisibilities[number]): void {
margin-bottom: auto; margin-bottom: auto;
} }
> .body { .body {
flex: 1 1 auto; flex: 1 1 auto;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
}
> span:first-child { .itemTitle {
display: block; display: block;
font-weight: bold; font-weight: bold;
} }
> span:last-child:not(:first-child) { .itemDescription {
opacity: 0.6; opacity: 0.6;
} }
}
> .toggle { .toggle {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -154,6 +156,4 @@ function choose(visibility: typeof misskey.noteVisibilities[number]): void {
margin-top: auto; margin-top: auto;
margin-bottom: auto; margin-bottom: auto;
} }
}
}
</style> </style>

18
packages/frontend/src/components/MkWaitingDialog.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="success ? done() : () => {}" @closed="emit('closed')"> <MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="success ? done() : () => {}" @closed="emit('closed')">
<div class="iuyakobc" :class="{ iconOnly: (text == null) || success }"> <div :class="[$style.root, { [$style.iconOnly]: (text == null) || success }]">
<i v-if="success" class="ti ti-check icon success"></i> <i v-if="success" :class="[$style.icon, $style.success]" class="ti ti-check"></i>
<MkLoading v-else class="icon waiting" :em="true"/> <MkLoading v-else :class="[$style.icon, $style.waiting]" :em="true"/>
<div v-if="text && !success" class="text">{{ text }}<MkEllipsis/></div> <div v-if="text && !success" :class="$style.text">{{ text }}<MkEllipsis/></div>
</div> </div>
</MkModal> </MkModal>
</template> </template>
@ -35,8 +35,8 @@ watch(() => props.showing, () => {
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.iuyakobc { .root {
margin: auto; margin: auto;
position: relative; position: relative;
padding: 32px; padding: 32px;
@ -54,8 +54,9 @@ watch(() => props.showing, () => {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
}
> .icon { .icon {
font-size: 32px; font-size: 32px;
&.success { &.success {
@ -67,8 +68,7 @@ watch(() => props.showing, () => {
} }
} }
> .text { .text {
margin-top: 16px; margin-top: 16px;
} }
}
</style> </style>