From 2d665b22660035e91c19617992066bd078a7d51d Mon Sep 17 00:00:00 2001 From: Hachi-R Date: Sat, 18 Jan 2025 23:06:55 -0300 Subject: [PATCH] refactor: update achievement panel styles --- .../pages/achievements/achievement-panel.scss | 41 +++++++++++++++---- .../pages/achievements/achievement-panel.tsx | 9 ++-- .../compared-achievement-panel.tsx | 22 +++++----- 3 files changed, 50 insertions(+), 22 deletions(-) diff --git a/src/renderer/src/pages/achievements/achievement-panel.scss b/src/renderer/src/pages/achievements/achievement-panel.scss index 8cf653ea..f4d9b27f 100644 --- a/src/renderer/src/pages/achievements/achievement-panel.scss +++ b/src/renderer/src/pages/achievements/achievement-panel.scss @@ -3,12 +3,12 @@ .achievement-panel { width: 100%; padding: globals.$spacing-unit * 2 globals.$spacing-unit * 3; - background-color: var(--color-background); + background-color: globals.$dark-background-color; display: flex; flex-direction: column; align-items: start; justify-content: space-between; - border-bottom: solid 1px var(--color-border); + border-bottom: solid 1px globals.$border-color; &__content { display: flex; @@ -25,12 +25,12 @@ &__download-details-row { gap: globals.$spacing-unit; display: flex; - color: var(--color-body); + color: globals.$body-color; align-items: center; } &__downloads-link { - color: var(--color-body); + color: globals.$body-color; text-decoration: underline; } @@ -47,17 +47,17 @@ } &::-webkit-progress-value { - background-color: var(--color-muted); + background-color: globals.$muted-color; } &--disabled { - opacity: var(--opacity-disabled); + opacity: globals.$disabled-opacity; } } &__link { text-align: start; - color: var(--color-body); + color: globals.$body-color; background: none; border: none; padding: 0; @@ -66,5 +66,32 @@ text-decoration: underline; cursor: pointer; } + + &--warning { + color: globals.$warning-color; + } + } + + &__grid { + display: grid; + gap: globals.$spacing-unit * 2; + } + + &__grid--with-subscription { + grid-template-columns: 3fr 1fr 1fr; + } + + &__grid--without-subscription { + grid-template-columns: 3fr 2fr; + } + + &__points-container { + display: flex; + gap: globals.$spacing-unit; + } + + &__content-icon { + width: 18px; + height: 18px; } } diff --git a/src/renderer/src/pages/achievements/achievement-panel.tsx b/src/renderer/src/pages/achievements/achievement-panel.tsx index 4da19dcd..d0cbb831 100644 --- a/src/renderer/src/pages/achievements/achievement-panel.tsx +++ b/src/renderer/src/pages/achievements/achievement-panel.tsx @@ -3,7 +3,6 @@ import HydraIcon from "@renderer/assets/icons/hydra.svg?react"; import { UserAchievement } from "@types"; import { useSubscription } from "@renderer/hooks/use-subscription"; import { useUserDetails } from "@renderer/hooks"; -import { vars } from "@renderer/theme.css"; import "./achievement-panel.scss"; export interface AchievementPanelProps { @@ -30,7 +29,8 @@ export function AchievementPanel({ achievements }: AchievementPanelProps) { return (
- {t("earned_points")} + {t("earned_points")}{" "} + ??? / ???
@@ -49,7 +49,8 @@ export function AchievementPanel({ achievements }: AchievementPanelProps) { return (
- {t("earned_points")} + {t("earned_points")}{" "} + {achievementsPointsEarnedSum} / {achievementsPointsTotal}
diff --git a/src/renderer/src/pages/achievements/compared-achievement-panel.tsx b/src/renderer/src/pages/achievements/compared-achievement-panel.tsx index db9baa09..ac124b26 100644 --- a/src/renderer/src/pages/achievements/compared-achievement-panel.tsx +++ b/src/renderer/src/pages/achievements/compared-achievement-panel.tsx @@ -1,8 +1,8 @@ import { useTranslation } from "react-i18next"; import HydraIcon from "@renderer/assets/icons/hydra.svg?react"; import { ComparedAchievements } from "@types"; -import { SPACING_UNIT } from "@renderer/theme.css"; import { useUserDetails } from "@renderer/hooks"; +import "./achievement-panel.scss"; export interface ComparedAchievementPanelProps { achievements: ComparedAchievements; @@ -16,25 +16,25 @@ export function ComparedAchievementPanel({ return (
-
- {t("available_points")} {" "} +
+ {t("available_points")}{" "} + {" "} {achievements.achievementsPointsTotal}
{hasActiveSubscription && (
- + {achievements.owner.achievementsPointsEarnedSum ?? 0}
)}
- + {achievements.target.achievementsPointsEarnedSum}