From 341af1ba2aafc18c397c95d12416520228bb7508 Mon Sep 17 00:00:00 2001 From: MyNameIsBatman Date: Thu, 16 Sep 2021 02:27:23 -0300 Subject: [PATCH] Purse updates --- src/assets/images/icons/help.png | Bin 0 -> 233 bytes src/assets/styles/icons.scss | 6 +++++ .../NotificationBubbleView.scss | 9 +++---- .../NotificationBubbleView.tsx | 2 +- .../NotificationClubGiftBubbleView.tsx | 10 ++++---- src/views/purse/PurseView.scss | 24 +++++++++--------- src/views/purse/PurseView.tsx | 4 +-- .../purse/views/currency/CurrencyView.scss | 5 ---- .../purse/views/seasonal/SeasonalView.scss | 14 ++++------ .../purse/views/seasonal/SeasonalView.tsx | 6 ++--- 10 files changed, 37 insertions(+), 43 deletions(-) create mode 100644 src/assets/images/icons/help.png diff --git a/src/assets/images/icons/help.png b/src/assets/images/icons/help.png new file mode 100644 index 0000000000000000000000000000000000000000..50d8aa8a0ef1f6d2c206bebcfd2acd354fde7bcf GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp@KrF?<1|)MVuEhf>&H|6fVg?3oArNM~bhqvgP;j=V zi(^Q|t)r6;@-`^&xZa#3dgtK98wZ+&3m%=j+r9Ey#H9;juE{x{k`~ylwBKRr9==&z zAS+(jiDN>L)x235TrFy5tllF33tFx28CgXnYCO0lvp%}YM6R{r$sE=zzXPj8E$e2A zuhUn4KWT&ET$lIUTh!NG%6r{zrx=#}5uIDXfYrZ(Vnp9otvurQ11q dS0npYM)wnXq8m%KWP#3P@O1TaS?83{1OQ*^RXzX! literal 0 HcmV?d00001 diff --git a/src/assets/styles/icons.scss b/src/assets/styles/icons.scss index 147da74e..a5108a7c 100644 --- a/src/assets/styles/icons.scss +++ b/src/assets/styles/icons.scss @@ -125,6 +125,12 @@ height: 15px; } + &.icon-help { + background: url('../images/icons/help.png'); + width: 13px; + height: 23px; + } + &.icon-joinroom { background-image: url('../images/toolbar/icons/joinroom.png'); width: 21px; diff --git a/src/layout/notification-bubble/NotificationBubbleView.scss b/src/layout/notification-bubble/NotificationBubbleView.scss index cadbac52..579d9531 100644 --- a/src/layout/notification-bubble/NotificationBubbleView.scss +++ b/src/layout/notification-bubble/NotificationBubbleView.scss @@ -1,14 +1,11 @@ .nitro-notification-bubble { pointer-events: all; - background-color: $gable-green; - border: 2px solid rgba($white, 0.5); + padding: 6px 5px; + 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; - &.club-gift { - - } - .bubble-image { width: 30px; height: 30px; diff --git a/src/layout/notification-bubble/NotificationBubbleView.tsx b/src/layout/notification-bubble/NotificationBubbleView.tsx index c1b29654..49a45b9f 100644 --- a/src/layout/notification-bubble/NotificationBubbleView.tsx +++ b/src/layout/notification-bubble/NotificationBubbleView.tsx @@ -21,7 +21,7 @@ export const NotificationBubbleView: FC = props => }, [ fadesOut, close ]); return ( -
+
{ children }
) diff --git a/src/views/notification-center/views/bubble-layouts/club-gift/NotificationClubGiftBubbleView.tsx b/src/views/notification-center/views/bubble-layouts/club-gift/NotificationClubGiftBubbleView.tsx index dcf4296a..0c03c440 100644 --- a/src/views/notification-center/views/bubble-layouts/club-gift/NotificationClubGiftBubbleView.tsx +++ b/src/views/notification-center/views/bubble-layouts/club-gift/NotificationClubGiftBubbleView.tsx @@ -11,13 +11,13 @@ export const NotificationClubGiftBubbleView: FC -
- +
+ { LocalizeText('notifications.text.club_gift') }
-
- { LocalizeText('notifications.button.later') } - +
+ + { LocalizeText('notifications.button.later') }
); diff --git a/src/views/purse/PurseView.scss b/src/views/purse/PurseView.scss index 72ed8e27..a4af3639 100644 --- a/src/views/purse/PurseView.scss +++ b/src/views/purse/PurseView.scss @@ -1,12 +1,10 @@ .nitro-purse { - padding: 2px; - background-color: $gable-green; - border: 2px solid rgba($white, 0.5); - border-top: 0; + background-color: rgba($dark,.95); font-size: $font-size-sm; pointer-events: all; - margin-bottom:5px; - + margin-bottom: 5px; + padding: 6px 5px; + box-shadow: inset 0px 5px lighten(rgba($dark,.6),2.5), inset 0 -4px darken(rgba($dark,.6),4); .notification-button { color:lighten($dark,20); @@ -17,19 +15,21 @@ } .nitro-purse-hc { - background-color: $william; - margin:0 2px; + background-color: rgba($light,.1); + margin: 0 5px; } .nitro-purse-button { - background: $bg-mirage-split-background; + border-bottom: 1px solid rgba(0, 0, 0, 0.3); + padding: 2px 3px; + border-radius: $border-radius; - &:not(:first-child) { - margin-top:2px; + &:last-child { + border-bottom: none; } &:hover { - background: $bg-cello-split-background; + background-color: rgba($light,.1); } } } diff --git a/src/views/purse/PurseView.tsx b/src/views/purse/PurseView.tsx index 09d22531..3b1c5c56 100644 --- a/src/views/purse/PurseView.tsx +++ b/src/views/purse/PurseView.tsx @@ -128,14 +128,14 @@ export const PurseView: FC<{}> = props =>
-
+
{ getClubText() }
-
+
diff --git a/src/views/purse/views/currency/CurrencyView.scss b/src/views/purse/views/currency/CurrencyView.scss index 492f8454..eb77390d 100644 --- a/src/views/purse/views/currency/CurrencyView.scss +++ b/src/views/purse/views/currency/CurrencyView.scss @@ -1,9 +1,4 @@ .nitro-currency { pointer-events: all; - background: $bg-mirage-split-background; position: relative; - - &:not(:first-of-type) { - margin-top:2px; - } } diff --git a/src/views/purse/views/seasonal/SeasonalView.scss b/src/views/purse/views/seasonal/SeasonalView.scss index e5f8894d..901c0d8d 100644 --- a/src/views/purse/views/seasonal/SeasonalView.scss +++ b/src/views/purse/views/seasonal/SeasonalView.scss @@ -1,16 +1,12 @@ .nitro-seasonal-currency { pointer-events: all; - padding: 2px; - background-color: $gable-green; - border: 2px solid rgba($white, 0.5); + padding: 6px 5px; + 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-currency-text { - background: $bg-mirage-split-background; - } - - .nitro-seasonal-icon { - background-color: $william; + .seasonal-text { + color: rgba($light,.5); } } diff --git a/src/views/purse/views/seasonal/SeasonalView.tsx b/src/views/purse/views/seasonal/SeasonalView.tsx index 1dbc4a20..3758c71c 100644 --- a/src/views/purse/views/seasonal/SeasonalView.tsx +++ b/src/views/purse/views/seasonal/SeasonalView.tsx @@ -10,11 +10,11 @@ export const SeasonalView: FC = props => return (
- { LocalizeText(`purse.seasonal.currency.${ type }`) } + { LocalizeText(`purse.seasonal.currency.${ type }`) } { LocalizeShortNumber(amount) }
-
- +
+
);