From 8fc43e7acc381c78580cac8953b30cd1a853fa82 Mon Sep 17 00:00:00 2001 From: Alex Zhang Date: Sat, 13 Apr 2024 12:58:13 -0700 Subject: [PATCH] Fix animation, edit styling of buttons --- .../LeaderboardRow/style.module.scss | 15 ++------------- .../LeaderboardRow/style.module.scss.d.ts | 1 + src/styles/pages/leaderboard.module.scss | 18 ++++++++++++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/components/leaderboard/LeaderboardRow/style.module.scss b/src/components/leaderboard/LeaderboardRow/style.module.scss index 66e2e859..3ec8bc53 100644 --- a/src/components/leaderboard/LeaderboardRow/style.module.scss +++ b/src/components/leaderboard/LeaderboardRow/style.module.scss @@ -23,18 +23,8 @@ } &.flash { - animation: flash 2s; - @keyframes flash { - 0%, - 20%, - 40%, - 60% { - background-color: var(--theme-background); - color: var(--theme-text-on-background-1); - } - - 10%, - 30%, + animation: blinker 2s; + @keyframes blinker { 50% { background-color: var(--theme-primary-2); color: var(--theme-background); @@ -78,7 +68,6 @@ } .rank { - color: var(--theme-text-on-surface-1); opacity: 0.5; text-align: center; diff --git a/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts b/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts index 0fde0f5d..2ef7150d 100644 --- a/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts +++ b/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts @@ -1,4 +1,5 @@ export type Styles = { + blinker: string; flash: string; match: string; name: string; diff --git a/src/styles/pages/leaderboard.module.scss b/src/styles/pages/leaderboard.module.scss index b8d91917..1879c0d1 100644 --- a/src/styles/pages/leaderboard.module.scss +++ b/src/styles/pages/leaderboard.module.scss @@ -32,6 +32,7 @@ .myPosition { align-items: center; background-color: var(--theme-primary-2); + border: 1px solid var(--theme-elevated-stroke); border-radius: 1rem; color: var(--theme-background); display: flex; @@ -54,10 +55,10 @@ border: 1px solid var(--theme-elevated-stroke); border-radius: 1rem; color: inherit; - font-size: 14px; + font-size: 1rem; height: 2rem; max-width: 18rem; - padding-left: 1.5rem; + padding-left: 1rem; padding-right: 0.5rem; width: 100%; @@ -66,8 +67,17 @@ } } - .timeDropdown select { - text-align: right; + .timeDropdown { + background-color: var(--theme-elevated-background); + border: 1px solid var(--theme-elevated-stroke); + border-radius: 2rem; + padding: 0.5rem 1rem; + + > select { + font-size: 1rem; + font-weight: normal; + line-height: 1.25rem; + } } }