diff --git a/src/components/Elements/Button/Button.jsx b/src/components/Elements/Button/Button.jsx index 830b51bd..396c44e9 100644 --- a/src/components/Elements/Button/Button.jsx +++ b/src/components/Elements/Button/Button.jsx @@ -12,6 +12,9 @@ const Button = forwardRef( case 'settings': className = 'btn-settings'; break; + case 'secondary': + className = 'btn-secondary'; + break; case 'icon': className = 'btn-icon'; break; diff --git a/src/components/Elements/MainModal/scss/marketplace/modules/_buttons.scss b/src/components/Elements/MainModal/scss/marketplace/modules/_buttons.scss index cdf06d34..9a692159 100644 --- a/src/components/Elements/MainModal/scss/marketplace/modules/_buttons.scss +++ b/src/components/Elements/MainModal/scss/marketplace/modules/_buttons.scss @@ -11,6 +11,15 @@ padding: 0 20px; } +.btn-secondary { + @include modal-button(secondary); + + display: inline; + margin-top: 0; + float: none !important; + padding: 0 20px; +} + .btn-navigation { @include modal-button(standard); diff --git a/src/components/Elements/MainModal/scss/settings/modules/tabs/_stats.scss b/src/components/Elements/MainModal/scss/settings/modules/tabs/_stats.scss index 5890342a..282ecb08 100644 --- a/src/components/Elements/MainModal/scss/settings/modules/tabs/_stats.scss +++ b/src/components/Elements/MainModal/scss/settings/modules/tabs/_stats.scss @@ -57,14 +57,42 @@ gap: 10px; } - svg { + .timestamp { + display: flex; + flex-flow: row; + align-items: center; + gap: 5px; + font-size: 12px; + @include themed { + color: t($subColor); + } + } + + .achievementTitle { + font-size: 18px; + font-weight: bold; + } + + svg.trophy { font-size: 20px !important; + @include themed { + background-image: t($slightGradient); + box-shadow: t($boxShadow); + } + padding: 15px; border-radius: 100%; + } + svg.trophyLocked { + font-size: 20px !important; @include themed { - background: t($modal-sidebarActive); + background-image: t($modal-sidebarActive); + box-shadow: t($boxShadow); } + + padding: 15px; + border-radius: 100%; } } @@ -88,11 +116,6 @@ flex-flow: column; gap: 2px; - span:first-child { - font-weight: bold; - font-size: 15px; - } - .subtitle { font-size: 13px !important; } diff --git a/src/components/Elements/ResetModal/ResetModal.jsx b/src/components/Elements/ResetModal/ResetModal.jsx index aec4c229..9f9be898 100644 --- a/src/components/Elements/ResetModal/ResetModal.jsx +++ b/src/components/Elements/ResetModal/ResetModal.jsx @@ -3,6 +3,7 @@ import variables from 'config/variables'; import { MdClose, MdRestartAlt } from 'react-icons/md'; import { setDefaultSettings } from 'utils/settings'; import { Tooltip } from 'components/Elements'; + function ResetModal({ modalClose }) { const reset = () => { variables.stats.postEvent('setting', 'Reset'); diff --git a/src/components/Elements/ShareModal/sharemodal.scss b/src/components/Elements/ShareModal/sharemodal.scss index 084a383d..09b477c3 100644 --- a/src/components/Elements/ShareModal/sharemodal.scss +++ b/src/components/Elements/ShareModal/sharemodal.scss @@ -18,12 +18,6 @@ flex-flow: row; justify-content: flex-end; gap: 20px; - - button { - gap: 20px; - display: flex; - flex-flow: row; - } } .textButton { @@ -46,13 +40,6 @@ gap: 15px; } - button { - place-items: center; - display: grid; - - @include basicIconButton(11px, 1.3rem, modal); - } - .copy { display: flex; flex-flow: row; diff --git a/src/config/variables.js b/src/config/variables.js index e8cceeeb..b5c2d119 100644 --- a/src/config/variables.js +++ b/src/config/variables.js @@ -1,5 +1,5 @@ import * as constants from 'config/constants'; -import Stats from 'utils/stats'; +import Stats from 'features/stats/api/stats'; const variables = { language: {}, diff --git a/src/features/background/components/ExcludeModal.jsx b/src/features/background/components/ExcludeModal.jsx index 381a75d4..f7a921db 100644 --- a/src/features/background/components/ExcludeModal.jsx +++ b/src/features/background/components/ExcludeModal.jsx @@ -1,7 +1,7 @@ import variables from 'config/variables'; import { memo } from 'react'; import EventBus from 'utils/eventbus'; -import { Tooltip } from 'components/Elements'; +import { Tooltip, Button } from 'components/Elements'; import { MdClose, MdDone } from 'react-icons/md'; @@ -33,14 +33,18 @@ function ExcludeModal({ modalClose, info }) { {variables.getMessage('widgets.background.exclude_confirm', { category: info.category })}