diff --git a/src/components/purse/PurseView.scss b/src/components/purse/PurseView.scss index 2901eebb..a860c41a 100644 --- a/src/components/purse/PurseView.scss +++ b/src/components/purse/PurseView.scss @@ -1,44 +1,26 @@ -.nitro-purse { - background-color: rgba($dark, 0.95); +.nitro-purse-container { font-size: $font-size-sm; pointer-events: all; - box-shadow: inset 0px 5px lighten(rgba($dark, 0.6), 2.5), - inset 0 -4px darken(rgba($dark, 0.6), 4); - .notification-button { - color: lighten($dark, 20); - cursor: pointer; - font-size: 0.9rem; - pointer-events: all; - display: none; - } - - .nitro-purse-hc { - background-color: rgba($light, 0.1); - } - - .nitro-purse-button { - - &:hover { - background-color: rgba($light, 0.1); - cursor: pointer; - } - } - - .nitro-currency { - pointer-events: all; - position: relative; - } - - .nitro-seasonal-currency { - pointer-events: all; - background-color: rgba($dark,.95); - box-shadow: inset 0px 5px lighten(rgba($dark,.6),2.5), inset 0 -4px darken(rgba($dark,.6),4); - font-size: $font-size-sm; - margin-bottom: 5px; + .nitro-purse { + background-color: rgba($dark, 0.95); + box-shadow: inset 0px 5px lighten(rgba($dark, 0.6), 2.5), inset 0 -4px darken(rgba($dark, 0.6), 4); - .seasonal-text { - color: rgba($light,.5); + .nitro-purse-subscription { + background-color: rgba($light, 0.1); } + + .nitro-purse-button { + padding: 3px 2px; + + &:hover { + background-color: rgba($light, 0.1); + } + } + } + + .nitro-purse-seasonal-currency { + background-color: rgba($dark, .95); + box-shadow: inset 0px 5px lighten(rgba($dark, .6),2.5), inset 0 -4px darken(rgba($dark, .6), 4); } } diff --git a/src/components/purse/PurseView.tsx b/src/components/purse/PurseView.tsx index 1363b2f6..6c7cc299 100644 --- a/src/components/purse/PurseView.tsx +++ b/src/components/purse/PurseView.tsx @@ -1,7 +1,7 @@ import { FriendlyTime, HabboClubLevelEnum, UserCurrencyComposer, UserSubscriptionComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { CreateLinkEvent, GetConfiguration, LocalizeText } from '../../api'; -import { Column, Flex, Grid } from '../../common'; +import { Column, Flex, Grid, Text } from '../../common'; import { HcCenterEvent } from '../../events/hc-center/HcCenterEvent'; import { UserSettingsUIEvent } from '../../events/user-settings/UserSettingsUIEvent'; import { dispatchUiEvent } from '../../hooks'; @@ -109,27 +109,29 @@ export const PurseView: FC<{}> = props => return ( - - - - - { getCurrencyElements(0, 2) } - - - - { getClubText } - - - - - - - - - - - - { getCurrencyElements(2, -1, true) } + + + + + + { getCurrencyElements(0, 2) } + + + + { getClubText } + + + + + + + + + + + + { getCurrencyElements(2, -1, true) } + ); } diff --git a/src/components/purse/views/CurrencyView.tsx b/src/components/purse/views/CurrencyView.tsx index 4204d444..27004784 100644 --- a/src/components/purse/views/CurrencyView.tsx +++ b/src/components/purse/views/CurrencyView.tsx @@ -1,7 +1,7 @@ import { FC, useMemo } from 'react'; import { OverlayTrigger, Tooltip } from 'react-bootstrap'; import { LocalizeFormattedNumber, LocalizeShortNumber } from '../../../api'; -import { Flex } from '../../../common'; +import { Flex, Text } from '../../../common'; import { CurrencyIcon } from '../../../views/shared/currency-icon/CurrencyIcon'; interface CurrencyViewProps @@ -18,9 +18,9 @@ export const CurrencyView: FC = props => const element = useMemo(() => { return ( - -
{ short ? LocalizeShortNumber(amount) : LocalizeFormattedNumber(amount) }
- + + { short ? LocalizeShortNumber(amount) : LocalizeFormattedNumber(amount) } + ); }, [ amount, short, type ]); diff --git a/src/components/purse/views/SeasonalView.tsx b/src/components/purse/views/SeasonalView.tsx index d46f6f26..49cc8930 100644 --- a/src/components/purse/views/SeasonalView.tsx +++ b/src/components/purse/views/SeasonalView.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; import { LocalizeFormattedNumber, LocalizeText } from '../../../api'; -import { Flex } from '../../../common'; +import { Flex, Text } from '../../../common'; import { CurrencyIcon } from '../../../views/shared/currency-icon/CurrencyIcon'; interface SeasonalViewProps @@ -14,14 +14,12 @@ export const SeasonalView: FC = props => const { type = -1, amount = -1 } = props; return ( - -
- { LocalizeText(`purse.seasonal.currency.${ type }`) } - { LocalizeFormattedNumber(amount) } -
-
+ + { LocalizeText(`purse.seasonal.currency.${ type }`) } + + { LocalizeFormattedNumber(amount) } -
+
); }