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

🎨

This commit is contained in:
syuilo 2025-05-07 10:44:43 +09:00
parent cdd131d542
commit 181f68e14e
4 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/ui-icons.afdesign
View File

Binary file not shown.

33
packages/frontend/src/components/MkDialog.vue
View File

@ -11,18 +11,13 @@ SPDX-License-Identifier: AGPL-3.0-only
</div> </div>
<div <div
v-else-if="!input && !select" v-else-if="!input && !select"
:class="[$style.icon, { :class="[$style.icon]"
[$style.type_success]: type === 'success',
[$style.type_error]: type === 'error',
[$style.type_warning]: type === 'warning',
[$style.type_info]: type === 'info',
}]"
> >
<i v-if="type === 'success'" :class="$style.iconInner" class="ti ti-check"></i> <MkSystemIcon v-if="type === 'success'" :class="$style.iconInner" style="width: 45px;" type="success"/>
<i v-else-if="type === 'error'" :class="$style.iconInner" class="ti ti-circle-x"></i> <MkSystemIcon v-else-if="type === 'error'" :class="$style.iconInner" style="width: 45px;" type="error"/>
<i v-else-if="type === 'warning'" :class="$style.iconInner" class="ti ti-alert-triangle"></i> <MkSystemIcon v-else-if="type === 'warning'" :class="$style.iconInner" style="width: 45px;" type="warn"/>
<i v-else-if="type === 'info'" :class="$style.iconInner" class="ti ti-info-circle"></i> <MkSystemIcon v-else-if="type === 'info'" :class="$style.iconInner" style="width: 45px;" type="info"/>
<i v-else-if="type === 'question'" :class="$style.iconInner" class="ti ti-help-circle"></i> <MkSystemIcon v-else-if="type === 'question'" :class="$style.iconInner" style="width: 45px;" type="question"/>
<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/> <MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
</div> </div>
<header v-if="title" :class="$style.title" class="_selectable"><Mfm :text="title"/></header> <header v-if="title" :class="$style.title" class="_selectable"><Mfm :text="title"/></header>
@ -202,22 +197,6 @@ function onInputKeydown(evt: KeyboardEvent) {
margin: 0 auto; margin: 0 auto;
} }
.type_info {
color: #55c4dd;
}
.type_success {
color: var(--MI_THEME-success);
}
.type_error {
color: var(--MI_THEME-error);
}
.type_warning {
color: var(--MI_THEME-warn);
}
.title { .title {
margin: 0 0 8px 0; margin: 0 0 8px 0;
font-weight: bold; font-weight: bold;

6
packages/frontend/src/components/global/MkResult.vue
View File

@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<Transition :name="prefer.s.animation ? '_transition_zoom' : ''" appear> <Transition :name="prefer.s.animation ? '_transition_zoom' : ''" appear>
<div :class="[$style.root, { [$style.warn]: type === 'notFound', [$style.error]: type === 'error' }]" class="_gaps_m"> <div :class="[$style.root, { [$style.warn]: type === 'notFound', [$style.error]: type === 'error' }]" class="_gaps">
<img v-if="type === 'empty' && instance.infoImageUrl" :src="instance.infoImageUrl" draggable="false" :class="$style.img"/> <img v-if="type === 'empty' && instance.infoImageUrl" :src="instance.infoImageUrl" draggable="false" :class="$style.img"/>
<MkSystemIcon v-else-if="type === 'empty'" type="info" :class="$style.icon"/> <MkSystemIcon v-else-if="type === 'empty'" type="info" :class="$style.icon"/>
<img v-if="type === 'notFound' && instance.notFoundImageUrl" :src="instance.notFoundImageUrl" draggable="false" :class="$style.img"/> <img v-if="type === 'notFound' && instance.notFoundImageUrl" :src="instance.notFoundImageUrl" draggable="false" :class="$style.img"/>
@ -46,8 +46,8 @@ const props = defineProps<{
} }
.icon { .icon {
width: 50px; width: 65px;
height: 50px; height: 65px;
margin: 0 auto; margin: 0 auto;
} }
</style> </style>

65
packages/frontend/src/components/global/MkSystemIcon.vue
View File

@ -4,20 +4,29 @@ SPDX-License-Identifier: AGPL-3.0-only
--> -->
<template> <template>
<svg v-if="type === 'info'" :class="[$style.icon, $style.info]" viewBox="0 0 128 128"> <svg v-if="type === 'info'" :class="[$style.icon, $style.info]" viewBox="0 0 160 160">
<path d="M64,92L64,56" style="--l:40;" :class="[$style.line, $style.anim]"/> <path d="M80,108L80,72" style="--l:37;" :class="[$style.line, $style.anim]"/>
<circle cx="64" cy="36" r="4" :class="[$style.fill]"/> <path d="M80,52L80,52" :class="[$style.line, $style.fade]"/>
<circle cx="64" cy="64" r="56" style="--l:400;" :class="[$style.line, $style.anim]"/> <circle cx="80" cy="80" r="56" style="--l:350;" :class="[$style.line, $style.anim]"/>
</svg> </svg>
<svg v-else-if="type === 'question'" :class="[$style.icon, $style.question]" viewBox="0 0 128 128"> <svg v-else-if="type === 'question'" :class="[$style.icon, $style.question]" viewBox="0 0 160 160">
<path d="M63.991,76L64,68C73.333,68 80,60.333 80,52C80,43.667 73.336,36 64,36C54.664,36 47.983,43.664 47.983,52" style="--l:85;" :class="[$style.line, $style.anim]"/> <path d="M80,92L79.991,84C88.799,83.98 96,76.962 96,68C96,59.038 88.953,52 79.991,52C71.03,52 64,59.038 64,68" style="--l:85;" :class="[$style.line, $style.anim]"/>
<circle cx="64" cy="92" r="4" :class="[$style.fill]"/> <path d="M80,108L80,108" :class="[$style.line, $style.fade]"/>
<circle cx="64" cy="64" r="56" style="--l:400;" :class="[$style.line, $style.anim]"/> <circle cx="80" cy="80" r="56" style="--l:350;" :class="[$style.line, $style.anim]"/>
</svg> </svg>
<svg v-else-if="type === 'error'" :class="[$style.icon, $style.error]" viewBox="0 0 128 128"> <svg v-else-if="type === 'success'" :class="[$style.icon, $style.success]" viewBox="0 0 160 160">
<path d="M47.029,47.029L80.971,80.971" style="--l:55;--duration:0.3s;" :class="[$style.line, $style.anim]"/> <path d="M62,80L74,92L98,68" style="--l:50;" :class="[$style.line, $style.anim]"/>
<path d="M80.971,47.029L47.029,80.971" style="--l:55;--duration:0.3s;--delay:0.2s;" :class="[$style.line, $style.anim]"/> <circle cx="80" cy="80" r="56" style="--l:350;" :class="[$style.line, $style.anim]"/>
<circle cx="64" cy="64" r="56" style="--l:400;" :class="[$style.line, $style.anim]"/> </svg>
<svg v-else-if="type === 'warn'" :class="[$style.icon, $style.warn]" viewBox="0 0 160 160">
<path d="M80,64L80,88" style="--l:27;" :class="[$style.line, $style.anim]"/>
<path d="M80,108L80,108" :class="[$style.line, $style.fade]"/>
<path d="M92,28L144,116C148.709,124.65 144.083,135.82 136,136L24,136C15.917,135.82 11.291,124.65 16,116L68,28C73.498,19.945 86.771,19.945 92,28Z" style="--l:390;" :class="[$style.line, $style.anim]"/>
</svg>
<svg v-else-if="type === 'error'" :class="[$style.icon, $style.error]" viewBox="0 0 160 160">
<path d="M63,63L96,96" style="--l:47;--duration:0.3s;" :class="[$style.line, $style.anim]"/>
<path d="M96,63L63,96" style="--l:47;--duration:0.3s;--delay:0.2s;" :class="[$style.line, $style.anim]"/>
<circle cx="80" cy="80" r="56" style="--l:350;" :class="[$style.line, $style.anim]"/>
</svg> </svg>
</template> </template>
@ -25,18 +34,25 @@ SPDX-License-Identifier: AGPL-3.0-only
import {} from 'vue'; import {} from 'vue';
const props = defineProps<{ const props = defineProps<{
type: 'info' | 'question' | 'warn' | 'error'; type: 'info' | 'question' | 'success' | 'warn' | 'error';
}>(); }>();
</script> </script>
<style lang="scss" module> <style lang="scss" module>
.icon { .icon {
color: var(--MI_THEME-accent);
stroke-linecap: round; stroke-linecap: round;
stroke-linejoin: round; stroke-linejoin: round;
&.info {
color: var(--MI_THEME-accent);
}
&.question { &.question {
color: var(--MI_THEME-warn); color: var(--MI_THEME-fg);
}
&.success {
color: var(--MI_THEME-success);
} }
&.warn { &.warn {
@ -61,16 +77,33 @@ const props = defineProps<{
.anim { .anim {
stroke-dasharray: var(--l); stroke-dasharray: var(--l);
stroke-dashoffset: var(--l); stroke-dashoffset: var(--l);
animation: line-animation var(--duration, 0.5s) ease-out 1 forwards; animation: line-animation var(--duration, 0.5s) cubic-bezier(0,0,.25,1) 1 forwards;
animation-delay: var(--delay, 0s);
}
.fade {
opacity: 0;
animation: fade-in var(--duration, 0.5s) cubic-bezier(0,0,.25,1) 1 forwards;
animation-delay: var(--delay, 0s); animation-delay: var(--delay, 0s);
} }
@keyframes line-animation { @keyframes line-animation {
0% { 0% {
stroke-dashoffset: var(--l); stroke-dashoffset: var(--l);
opacity: 0;
} }
100% { 100% {
stroke-dashoffset: 0; stroke-dashoffset: 0;
opacity: 1;
}
}
@keyframes fade-in {
0% {
opacity: 0;
}
100% {
opacity: 1;
} }
} }
</style> </style>