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

refactor

This commit is contained in:
syuilo 2023-05-31 13:27:59 +09:00
parent aba0755880
commit e11f82c300
1 changed files with 370 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
packages/frontend/src/ui/_common_/navbar.vue
View File

@ -1,51 +1,50 @@
<template> <template>
<div class="mvcprjjd" :class="{ iconOnly }"> <div :class="[$style.root, { [$style.iconOnly]: iconOnly }]">
<div class="body"> <div :class="$style.body">
<div class="top"> <div :class="$style.top">
<div class="banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }"></div> <div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }"></div>
<button v-click-anime v-tooltip.noDelay.right="instance.name ?? i18n.ts.instance" class="item _button instance" @click="openInstanceMenu"> <button v-tooltip.noDelay.right="instance.name ?? i18n.ts.instance" class="_button" :class="$style.instance" @click="openInstanceMenu">
<img :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/> <img :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
</button> </button>
</div> </div>
<div class="middle"> <div :class="$style.middle">
<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.timeline" class="item index" activeClass="active" to="/" exact> <MkA v-tooltip.noDelay.right="i18n.ts.timeline" :class="$style.item" :activeClass="$style.active" to="/" exact>
<i class="icon ti ti-home ti-fw"></i><span class="text">{{ i18n.ts.timeline }}</span> <i :class="$style.itemIcon" class="ti ti-home ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.timeline }}</span>
</MkA> </MkA>
<template v-for="item in menu"> <template v-for="item in menu">
<div v-if="item === '-'" class="divider"></div> <div v-if="item === '-'" :class="$style.divider"></div>
<component <component
:is="navbarItemDef[item].to ? 'MkA' : 'button'" :is="navbarItemDef[item].to ? 'MkA' : 'button'"
v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)"
v-click-anime
v-tooltip.noDelay.right="navbarItemDef[item].title" v-tooltip.noDelay.right="navbarItemDef[item].title"
class="item _button" class="_button"
:class="[item, { active: navbarItemDef[item].active }]" :class="[$style.item, { [$style.active]: navbarItemDef[item].active }]"
activeClass="active" :activeClass="$style.active"
:to="navbarItemDef[item].to" :to="navbarItemDef[item].to"
v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}"
> >
<i class="icon ti-fw" :class="navbarItemDef[item].icon"></i><span class="text">{{ navbarItemDef[item].title }}</span> <i class="ti-fw" :class="[$style.itemIcon, navbarItemDef[item].icon]"></i><span :class="$style.itemText">{{ navbarItemDef[item].title }}</span>
<span v-if="navbarItemDef[item].indicated" class="indicator"><i class="icon _indicatorCircle"></i></span> <span v-if="navbarItemDef[item].indicated" :class="$style.itemIndicator"><i class="_indicatorCircle"></i></span>
</component> </component>
</template> </template>
<div class="divider"></div> <div :class="$style.divider"></div>
<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime v-tooltip.noDelay.right="i18n.ts.controlPanel" class="item" activeClass="active" to="/admin"> <MkA v-if="$i.isAdmin || $i.isModerator" v-tooltip.noDelay.right="i18n.ts.controlPanel" :class="$style.item" :activeClass="$style.active" to="/admin">
<i class="icon ti ti-dashboard ti-fw"></i><span class="text">{{ i18n.ts.controlPanel }}</span> <i :class="$style.itemIcon" class="ti ti-dashboard ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.controlPanel }}</span>
</MkA> </MkA>
<button v-click-anime class="item _button" @click="more"> <button class="_button" :class="$style.item" @click="more">
<i class="icon ti ti-grid-dots ti-fw"></i><span class="text">{{ i18n.ts.more }}</span> <i :class="$style.itemIcon" class="ti ti-grid-dots ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.more }}</span>
<span v-if="otherMenuItemIndicated" class="indicator"><i class="icon _indicatorCircle"></i></span> <span v-if="otherMenuItemIndicated" :class="$style.itemIndicator"><i class="_indicatorCircle"></i></span>
</button> </button>
<MkA v-click-anime v-tooltip.noDelay.right="i18n.ts.settings" class="item" activeClass="active" to="/settings"> <MkA v-tooltip.noDelay.right="i18n.ts.settings" :class="$style.item" :activeClass="$style.active" to="/settings">
<i class="icon ti ti-settings ti-fw"></i><span class="text">{{ i18n.ts.settings }}</span> <i :class="$style.itemIcon" class="ti ti-settings ti-fw"></i><span :class="$style.itemText">{{ i18n.ts.settings }}</span>
</MkA> </MkA>
</div> </div>
<div class="bottom"> <div :class="$style.bottom">
<button v-tooltip.noDelay.right="i18n.ts.note" class="item _button post" data-cy-open-post-form @click="os.post"> <button v-tooltip.noDelay.right="i18n.ts.note" class="_button" :class="[$style.post]" data-cy-open-post-form @click="os.post">
<i class="icon ti ti-pencil ti-fw"></i><span class="text">{{ i18n.ts.note }}</span> <i class="ti ti-pencil ti-fw" :class="$style.postIcon"></i><span :class="$style.postText">{{ i18n.ts.note }}</span>
</button> </button>
<button v-click-anime v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="item _button account" @click="openAccountMenu"> <button v-tooltip.noDelay.right="`${i18n.ts.account}: @${$i.username}`" class="_button" :class="[$style.account]" @click="openAccountMenu">
<MkAvatar :user="$i" class="avatar"/><MkAcct class="text _nowrap" :user="$i"/> <MkAvatar :user="$i" :class="$style.avatar"/><MkAcct class="_nowrap" :class="$style.acct" :user="$i"/>
</button> </button>
</div> </div>
</div> </div>
@ -99,21 +98,22 @@ function more(ev: MouseEvent) {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.mvcprjjd { .root {
$nav-width: 250px; --nav-width: 250px;
$nav-icon-only-width: 80px; --nav-icon-only-width: 80px;
flex: 0 0 $nav-width; flex: 0 0 var(--nav-width);
width: $nav-width; width: var(--nav-width);
box-sizing: border-box; box-sizing: border-box;
}
> .body { .body {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
z-index: 1001; z-index: 1001;
width: $nav-icon-only-width; width: var(--nav-icon-only-width);
height: 100dvh; height: 100dvh;
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
@ -125,11 +125,12 @@ function more(ev: MouseEvent) {
flex-direction: column; flex-direction: column;
} }
&:not(.iconOnly) { .root:not(.iconOnly) {
> .body { .body {
width: $nav-width; width: var(--nav-width);
}
> .top { .top {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 1; z-index: 1;
@ -137,8 +138,9 @@ function more(ev: MouseEvent) {
background: var(--X14); background: var(--X14);
-webkit-backdrop-filter: var(--blur, blur(8px)); -webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px));
}
> .banner { .banner {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -150,29 +152,29 @@ function more(ev: MouseEvent) {
mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%); mask-image: linear-gradient(0deg, rgba(0,0,0,0) 15%, rgba(0,0,0,0.75) 100%);
} }
> .instance { .instance {
position: relative; position: relative;
display: block; display: block;
text-align: center; text-align: center;
width: 100%; width: 100%;
}
> .icon { .instanceIcon {
display: inline-block; display: inline-block;
width: 38px; width: 38px;
aspect-ratio: 1; aspect-ratio: 1;
} }
}
}
> .bottom { .bottom {
position: sticky; position: sticky;
bottom: 0; bottom: 0;
padding: 20px 0; padding: 20px 0;
background: var(--X14); background: var(--X14);
-webkit-backdrop-filter: var(--blur, blur(8px)); -webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px));
}
> .post { .post {
position: relative; position: relative;
display: block; display: block;
width: 100%; width: 100%;
@ -201,20 +203,20 @@ function more(ev: MouseEvent) {
background: var(--accentLighten); background: var(--accentLighten);
} }
} }
}
> .icon { .postIcon {
position: relative; position: relative;
margin-left: 30px; margin-left: 30px;
margin-right: 8px; margin-right: 8px;
width: 32px; width: 32px;
} }
> .text { .postText {
position: relative; position: relative;
} }
}
> .account { .account {
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
@ -223,8 +225,9 @@ function more(ev: MouseEvent) {
text-align: left; text-align: left;
box-sizing: border-box; box-sizing: border-box;
margin-top: 16px; margin-top: 16px;
}
> .avatar { .avatar {
display: block; display: block;
flex-shrink: 0; flex-shrink: 0;
position: relative; position: relative;
@ -233,23 +236,22 @@ function more(ev: MouseEvent) {
margin-right: 8px; margin-right: 8px;
} }
> .text { .acct {
display: block; display: block;
flex-shrink: 1; flex-shrink: 1;
padding-right: 8px; padding-right: 8px;
} }
}
}
> .middle { .middle {
flex: 1; flex: 1;
}
> .divider { .divider {
margin: 16px 16px; margin: 16px 16px;
border-top: solid 0.5px var(--divider); border-top: solid 0.5px var(--divider);
} }
> .item { .item {
position: relative; position: relative;
display: block; display: block;
padding-left: 30px; padding-left: 30px;
@ -262,26 +264,6 @@ function more(ev: MouseEvent) {
box-sizing: border-box; box-sizing: border-box;
color: var(--navFg); color: var(--navFg);
> .icon {
position: relative;
width: 32px;
margin-right: 8px;
}
> .indicator {
position: absolute;
top: 0;
left: 20px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
}
> .text {
position: relative;
font-size: 0.9em;
}
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: var(--navHoverFg); color: var(--navHoverFg);
@ -310,18 +292,37 @@ function more(ev: MouseEvent) {
} }
} }
} }
.itemIcon {
position: relative;
width: 32px;
margin-right: 8px;
} }
.itemIndicator {
position: absolute;
top: 0;
left: 20px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
}
.itemText {
position: relative;
font-size: 0.9em;
} }
} }
&.iconOnly { .root.iconOnly {
flex: 0 0 $nav-icon-only-width; flex: 0 0 var(--nav-icon-only-width);
width: $nav-icon-only-width; width: var(--nav-icon-only-width);
> .body { .body {
width: $nav-icon-only-width; width: var(--nav-icon-only-width);
}
> .top { .top {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 1; z-index: 1;
@ -329,29 +330,30 @@ function more(ev: MouseEvent) {
background: var(--X14); background: var(--X14);
-webkit-backdrop-filter: var(--blur, blur(8px)); -webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px));
}
> .instance { .instance {
display: block; display: block;
text-align: center; text-align: center;
width: 100%; width: 100%;
}
> .icon { .instanceIcon {
display: inline-block; display: inline-block;
width: 30px; width: 30px;
aspect-ratio: 1; aspect-ratio: 1;
} }
}
}
> .bottom { .bottom {
position: sticky; position: sticky;
bottom: 0; bottom: 0;
padding: 20px 0; padding: 20px 0;
background: var(--X14); background: var(--X14);
-webkit-backdrop-filter: var(--blur, blur(8px)); -webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px));
}
> .post { .post {
display: block; display: block;
position: relative; position: relative;
width: 100%; width: 100%;
@ -379,69 +381,50 @@ function more(ev: MouseEvent) {
background: var(--accentLighten); background: var(--accentLighten);
} }
} }
}
> .icon { .postIcon {
position: relative; position: relative;
color: var(--fgOnAccent); color: var(--fgOnAccent);
} }
> .text { .postText {
display: none; display: none;
} }
}
> .account { .account {
display: block; display: block;
text-align: center; text-align: center;
width: 100%; width: 100%;
}
> .avatar { .avatar {
display: inline-block; display: inline-block;
width: 38px; width: 38px;
aspect-ratio: 1; aspect-ratio: 1;
} }
> .text { .acct {
display: none; display: none;
} }
}
}
> .middle { .middle {
flex: 1; flex: 1;
}
> .divider { .divider {
margin: 8px auto; margin: 8px auto;
width: calc(100% - 32px); width: calc(100% - 32px);
border-top: solid 0.5px var(--divider); border-top: solid 0.5px var(--divider);
} }
> .item { .item {
display: block; display: block;
position: relative; position: relative;
padding: 18px 0; padding: 18px 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
> .icon {
display: block;
margin: 0 auto;
opacity: 0.7;
}
> .text {
display: none;
}
> .indicator {
position: absolute;
top: 6px;
left: 24px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
}
&:hover, &.active { &:hover, &.active {
text-decoration: none; text-decoration: none;
color: var(--accent); color: var(--accent);
@ -461,13 +444,30 @@ function more(ev: MouseEvent) {
background: var(--accentedBg); background: var(--accentedBg);
} }
> .icon, > .text { > .icon,
> .text {
opacity: 1; opacity: 1;
} }
} }
} }
.itemIcon {
display: block;
margin: 0 auto;
opacity: 0.7;
} }
.itemText {
display: none;
} }
.itemIndicator {
position: absolute;
top: 6px;
left: 24px;
color: var(--navIndicator);
font-size: 8px;
animation: blink 1s infinite;
} }
} }
</style> </style>