diff --git a/apps/web/src/components/Achievement.css b/apps/web/src/components/Achievement.css index cca5d20..7ba540d 100644 --- a/apps/web/src/components/Achievement.css +++ b/apps/web/src/components/Achievement.css @@ -2,9 +2,10 @@ display: flex; justify-content: space-between; align-items: center; - padding: 0 1rem; - height: 2rem; - gap: 1rem; + padding: 0 calc(0.5rem * var(--ratio-font)); + height: calc(2rem * var(--ratio)); + gap: calc(1rem * var(--ratio-font)); + font-size: calc(1rem * var(--ratio-font)); color: var(--grade-color); background: var(--background, var(--base-background-color)); cursor: pointer; @@ -12,9 +13,16 @@ border: 0.0625rem solid var(--grade-color); box-sizing: border-box; transition: all 0.2s ease-in-out; + svg { + fill: var(--grade-color); + transition: fill 0.2s ease-in-out; + stroke: none; + width: calc(1.2rem * var(--ratio-font)); + height: calc(1.2rem * var(--ratio-font)); + } .name { font-weight: bold; } .description { - font-size: 0.85rem; + font-size: calc(0.85rem * var(--ratio-font)); user-select: none; &::before { content: '['; margin-right: 0.125rem; } &::after { content: ']'; margin-left: 0.125rem; } diff --git a/apps/web/src/components/Achievement.tsx b/apps/web/src/components/Achievement.tsx index ff0fbc3..34d2afb 100644 --- a/apps/web/src/components/Achievement.tsx +++ b/apps/web/src/components/Achievement.tsx @@ -1,6 +1,19 @@ import { type Achievement as A, achievement } from '@remake/data' import './Achievement.css' +const Icon = () => ( + + + + + + +) export interface AchievementProps { id: A['id'] } @@ -10,6 +23,7 @@ export function Achievement({ id }: AchievementProps) { const grade = ach?.grade ?? 0 return (
+ {ach.name} {ach.description}
diff --git a/apps/web/src/toast/Achv.css b/apps/web/src/toast/Achv.css index 06b5e8a..cf890de 100644 --- a/apps/web/src/toast/Achv.css +++ b/apps/web/src/toast/Achv.css @@ -11,7 +11,7 @@ opacity: 1; transition: all 0.2s ease-in-out; &.visible { - animation: achv-fade-in 0.2s ease-out forwards; + animation: achv-slide-in 0.2s ease-out forwards; } &.hidden { animation: achv-fade-out 0.2s ease-out forwards; diff --git a/apps/web/src/toast/Achv.tsx b/apps/web/src/toast/Achv.tsx index de48396..f55fc53 100644 --- a/apps/web/src/toast/Achv.tsx +++ b/apps/web/src/toast/Achv.tsx @@ -3,7 +3,7 @@ import Achievement from '@/components/Achievement' import './Achv.css' export function ToastAchvContainer() { - const { toasts, handlers } = useToaster({ duration: 1500 }, 'achv-toast') + const { toasts, handlers } = useToaster({ duration: 4000 }, 'achv-toast') const { startPause, endPause, calculateOffset, updateHeight } = handlers return (