From c5689556d9d6abf688957bc2a7a4c8b5f9061939 Mon Sep 17 00:00:00 2001 From: alexsparkes Date: Tue, 12 Sep 2023 14:39:35 +0100 Subject: [PATCH] feat: 7.0 or something daft like that Co-authored-by: David Ralph --- src/components/modals/main/scss/index.scss | 1 + .../modals/main/settings/sections/Stats.jsx | 20 +++++++++++-------- src/components/modals/welcome/welcome.scss | 1 + src/scss/_toast.scss | 1 + src/scss/index.scss | 13 ++++++++++++ 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/components/modals/main/scss/index.scss b/src/components/modals/main/scss/index.scss index a9b6acb2..51576fbd 100644 --- a/src/components/modals/main/scss/index.scss +++ b/src/components/modals/main/scss/index.scss @@ -188,6 +188,7 @@ h5 { flex-direction: row-reverse; justify-content: space-between; padding: 5px 5px 5px 20px; + transition: 0.3s; @include themed { background: t($modal-sidebar); diff --git a/src/components/modals/main/settings/sections/Stats.jsx b/src/components/modals/main/settings/sections/Stats.jsx index 5c0f7267..169d66ef 100644 --- a/src/components/modals/main/settings/sections/Stats.jsx +++ b/src/components/modals/main/settings/sections/Stats.jsx @@ -72,7 +72,7 @@ export default class Stats extends PureComponent { this.setState({ stats: {}, }); - toast.success('Stats reset'); + toast('Stats reset'); this.getAchievements(); this.forceUpdate(); } @@ -97,9 +97,16 @@ export default class Stats extends PureComponent { return ( <> - - {variables.getMessage('modals.main.settings.sections.stats.title')} - +
+ + {variables.getMessage('modals.main.settings.sections.stats.title')} + +
+ +
{' '} +
@@ -178,9 +185,6 @@ export default class Stats extends PureComponent {
-
- -
{variables.getMessage('modals.main.settings.sections.stats.achievements')} @@ -195,7 +199,7 @@ export default class Stats extends PureComponent {
{this.state.achievements.map((achievement, index) => { if (achievement.achieved) { - return achievementElement(index, achievement.name, achievement.achieved) + return achievementElement(index, achievement.name, achievement.achieved); } })}
diff --git a/src/components/modals/welcome/welcome.scss b/src/components/modals/welcome/welcome.scss index 3f6a0764..ad5ae462 100644 --- a/src/components/modals/welcome/welcome.scss +++ b/src/components/modals/welcome/welcome.scss @@ -165,6 +165,7 @@ display: flex; flex-flow: column; align-items: center; + transition: 0.3s; @include themed { background: t($modal-sidebar); diff --git a/src/scss/_toast.scss b/src/scss/_toast.scss index ef7af1b1..4921c2b8 100644 --- a/src/scss/_toast.scss +++ b/src/scss/_toast.scss @@ -16,6 +16,7 @@ .Toastify__close-button { align-self: center !important; + color: var(--modal-text) !important; } .Toastify__progress-bar--default { diff --git a/src/scss/index.scss b/src/scss/index.scss index 7290aa6e..bd0d3a71 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -118,3 +118,16 @@ body { format('woff2'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } + + +.statsTopBar { + display: flex; + justify-content: space-between; + align-items: center; + button { + margin-bottom: 15px; + flex-flow: row !important; + padding-left: 20px; + padding-right: 20px; + } +} \ No newline at end of file