natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(frontend): use css modules

This commit is contained in:
syuilo 2023-05-09 18:47:06 +09:00
parent 461f761aa6
commit baa45859c1
2 changed files with 157 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/frontend/src/components/MkModalWindow.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')"> <MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
<div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }" @keydown="onKeydown"> <div ref="rootEl" :class="$style.root" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }" @keydown="onKeydown">
<div ref="headerEl" class="header"> <div ref="headerEl" :class="$style.header">
<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ti ti-x"></i></button> <button v-if="withOkButton" :class="$style.headerButton" class="_button" @click="$emit('close')"><i class="ti ti-x"></i></button>
<span class="title"> <span :class="$style.title">
<slot name="header"></slot> <slot name="header"></slot>
</span> </span>
<button v-if="!withOkButton" class="_button" data-cy-modal-window-close @click="$emit('close')"><i class="ti ti-x"></i></button> <button v-if="!withOkButton" :class="$style.headerButton" class="_button" data-cy-modal-window-close @click="$emit('close')"><i class="ti ti-x"></i></button>
<button v-if="withOkButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ti ti-check"></i></button> <button v-if="withOkButton" :class="$style.headerButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ti ti-check"></i></button>
</div> </div>
<div class="body"> <div :class="$style.body">
<slot :width="bodyWidth" :height="bodyHeight"></slot> <slot :width="bodyWidth" :height="bodyHeight"></slot>
</div> </div>
</div> </div>
@ -81,8 +81,8 @@ defineExpose({
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.ebkgoccj { .root {
margin: auto; margin: auto;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
@ -96,28 +96,31 @@ defineExpose({
--root-margin: 16px; --root-margin: 16px;
} }
> .header { --headerHeight: 46px;
$height: 46px; --headerHeightNarrow: 42px;
$height-narrow: 42px; }
.header {
display: flex; display: flex;
flex-shrink: 0; flex-shrink: 0;
background: var(--windowHeader); background: var(--windowHeader);
-webkit-backdrop-filter: var(--blur, blur(15px)); -webkit-backdrop-filter: var(--blur, blur(15px));
backdrop-filter: var(--blur, blur(15px)); backdrop-filter: var(--blur, blur(15px));
}
> button { .headerButton {
height: $height; height: var(--headerHeight);
width: $height; width: var(--headerHeight);
@media (max-width: 500px) { @media (max-width: 500px) {
height: $height-narrow; height: var(--headerHeightNarrow);
width: $height-narrow; width: var(--headerHeightNarrow);
}
} }
}
> .title { .title {
flex: 1; flex: 1;
line-height: $height; line-height: var(--headerHeight);
padding-left: 32px; padding-left: 32px;
font-weight: bold; font-weight: bold;
white-space: nowrap; white-space: nowrap;
@ -126,21 +129,19 @@ defineExpose({
pointer-events: none; pointer-events: none;
@media (max-width: 500px) { @media (max-width: 500px) {
line-height: $height-narrow; line-height: var(--headerHeightNarrow);
padding-left: 16px; padding-left: 16px;
} }
} }
> button + .title { .headerButton + .title {
padding-left: 0; padding-left: 0;
} }
}
> .body { .body {
flex: 1; flex: 1;
overflow: auto; overflow: auto;
background: var(--panel); background: var(--panel);
container-type: size; container-type: size;
}
} }
</style> </style>

119
packages/frontend/src/components/MkSelect.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div class="vblkjoeq"> <div>
<div class="label" @click="focus"><slot name="label"></slot></div> <div :class="$style.label" @click="focus"><slot name="label"></slot></div>
<div ref="container" class="input" :class="{ inline, disabled, focused }" @mousedown.prevent="show"> <div ref="container" :class="[$style.input, { [$style.inline]: inline, [$style.disabled]: disabled, [$style.focused]: focused }]" @mousedown.prevent="show">
<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div> <div ref="prefixEl" :class="$style.prefix"><slot name="prefix"></slot></div>
<select <select
ref="inputEl" ref="inputEl"
v-model="v" v-model="v"
v-adaptive-border v-adaptive-border
class="select" :class="$style.inputCore"
:disabled="disabled" :disabled="disabled"
:required="required" :required="required"
:readonly="readonly" :readonly="readonly"
@ -18,9 +18,9 @@
> >
<slot></slot> <slot></slot>
</select> </select>
<div ref="suffixEl" class="suffix"><i class="ti ti-chevron-down" :class="[$style.chevron, { [$style.chevronOpening]: opening }]"></i></div> <div ref="suffixEl" :class="$style.suffix"><i class="ti ti-chevron-down" :class="[$style.chevron, { [$style.chevronOpening]: opening }]"></i></div>
</div> </div>
<div class="caption"><slot name="caption"></slot></div> <div :class="$style.caption"><slot name="caption"></slot></div>
<MkButton v-if="manualSave && changed" primary @click="updated"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton> <MkButton v-if="manualSave && changed" primary @click="updated"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
</div> </div>
@ -169,9 +169,8 @@ function show(ev: MouseEvent) {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.vblkjoeq { .label {
> .label {
font-size: 0.85em; font-size: 0.85em;
padding: 0 0 8px 0; padding: 0 0 8px 0;
user-select: none; user-select: none;
@ -179,9 +178,9 @@ function show(ev: MouseEvent) {
&:empty { &:empty {
display: none; display: none;
} }
} }
> .caption { .caption {
font-size: 0.85em; font-size: 0.85em;
padding: 8px 0 0 0; padding: 8px 0 0 0;
color: var(--fgTransparentWeak); color: var(--fgTransparentWeak);
@ -189,19 +188,41 @@ function show(ev: MouseEvent) {
&:empty { &:empty {
display: none; display: none;
} }
} }
> .input { .input {
position: relative; position: relative;
cursor: pointer; cursor: pointer;
&:hover { &.inline {
> .select { display: inline-block;
border-color: var(--inputBorderHover) !important; margin: 0;
}
&.focused {
> .inputCore {
border-color: var(--accent) !important;
//box-shadow: 0 0 0 4px var(--focus);
} }
} }
> .select { &.disabled {
opacity: 0.7;
&,
> .inputCore {
cursor: not-allowed !important;
}
}
&:hover {
> .inputCore {
border-color: var(--inputBorderHover) !important;
}
}
}
.inputCore {
appearance: none; appearance: none;
-webkit-appearance: none; -webkit-appearance: none;
display: block; display: block;
@ -219,14 +240,14 @@ function show(ev: MouseEvent) {
outline: none; outline: none;
box-shadow: none; box-shadow: none;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer;
transition: border-color 0.1s ease-out; transition: border-color 0.1s ease-out;
cursor: pointer;
pointer-events: none; pointer-events: none;
user-select: none; user-select: none;
} }
> .prefix, .prefix,
> .suffix { .suffix {
display: flex; display: flex;
align-items: center; align-items: center;
position: absolute; position: absolute;
@ -235,55 +256,29 @@ function show(ev: MouseEvent) {
padding: 0 12px; padding: 0 12px;
font-size: 1em; font-size: 1em;
height: v-bind("height + 'px'"); height: v-bind("height + 'px'");
pointer-events: none;
&:empty {
display: none;
}
> * {
display: inline-block;
min-width: 16px; min-width: 16px;
max-width: 150px; max-width: 150px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} box-sizing: border-box;
} pointer-events: none;
> .prefix { &:empty {
left: 0; display: none;
padding-right: 6px;
}
> .suffix {
right: 0;
padding-left: 6px;
}
&.inline {
display: inline-block;
margin: 0;
}
&.focused {
> select {
border-color: var(--accent) !important;
}
}
&.disabled {
opacity: 0.7;
&, * {
cursor: not-allowed !important;
}
}
} }
} }
</style>
<style lang="scss" module> .prefix {
left: 0;
padding-right: 6px;
}
.suffix {
right: 0;
padding-left: 6px;
}
.chevron { .chevron {
transition: transform 0.1s ease-out; transition: transform 0.1s ease-out;
} }