Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
91a61989
Commit
91a61989
authored
Oct 22, 2024
by
Max Alekseenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merits icon
parent
7d87ecf1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
8 deletions
+20
-8
RewardsDashboardCardValue.tsx
ui/rewards/RewardsDashboardCardValue.tsx
+7
-4
CongratsStepContent.tsx
ui/rewards/steps/CongratsStepContent.tsx
+13
-4
No files found.
ui/rewards/RewardsDashboardCardValue.tsx
View file @
91a61989
import
{
Flex
,
Text
}
from
'
@chakra-ui/react
'
;
import
{
Flex
,
Text
,
Icon
}
from
'
@chakra-ui/react
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
// This icon doesn't work properly when it is in the sprite
// Probably because of the gradient
// eslint-disable-next-line no-restricted-imports
import
meritsIcon
from
'
icons/merits_colored.svg
'
;
import
HintPopover
from
'
ui/shared/HintPopover
'
;
import
HintPopover
from
'
ui/shared/HintPopover
'
;
import
IconSvg
from
'
ui/shared/IconSvg
'
;
type
Props
=
{
type
Props
=
{
label
:
string
;
label
:
string
;
...
@@ -28,8 +31,8 @@ const RewardsDashboardCard = ({ label, value, withIcon, hint }: Props) => {
...
@@ -28,8 +31,8 @@ const RewardsDashboardCard = ({ label, value, withIcon, hint }: Props) => {
</
Flex
>
</
Flex
>
<
Flex
alignItems=
"center"
>
<
Flex
alignItems=
"center"
>
{
withIcon
&&
(
{
withIcon
&&
(
<
Icon
Svg
<
Icon
name=
"merits_colored"
as=
{
meritsIcon
}
boxSize=
{
12
}
boxSize=
{
12
}
mt=
{
-
2
}
mt=
{
-
2
}
mb=
{
-
2.5
}
mb=
{
-
2.5
}
...
...
ui/rewards/steps/CongratsStepContent.tsx
View file @
91a61989
import
{
Text
,
Box
,
Flex
,
Button
,
Skeleton
}
from
'
@chakra-ui/react
'
;
import
{
Text
,
Box
,
Flex
,
Button
,
Skeleton
,
Icon
}
from
'
@chakra-ui/react
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
{
route
}
from
'
nextjs-routes
'
;
import
{
route
}
from
'
nextjs-routes
'
;
// This icon doesn't work properly when it is in the sprite
// Probably because of the gradient
// eslint-disable-next-line no-restricted-imports
import
meritsIcon
from
'
icons/merits_colored.svg
'
;
import
{
useRewardsContext
}
from
'
lib/contexts/rewards
'
;
import
{
useRewardsContext
}
from
'
lib/contexts/rewards
'
;
import
IconSvg
from
'
ui/shared/IconSvg
'
;
import
IconSvg
from
'
ui/shared/IconSvg
'
;
...
@@ -28,8 +32,8 @@ const CongratsStepContent = ({ isReferral }: Props) => {
...
@@ -28,8 +32,8 @@ const CongratsStepContent = ({ isReferral }: Props) => {
padding={ 2 }
padding={ 2 }
mb={ 8 }
mb={ 8 }
>
>
<Icon
Svg
<Icon
name="merits_colored"
as={ meritsIcon }
boxSize="60px"
boxSize="60px"
mb={ -1 }
mb={ -1 }
filter="drop-shadow(0px 6px 3px rgba(21, 57, 103, 0.1))"
filter="drop-shadow(0px 6px 3px rgba(21, 57, 103, 0.1))"
...
@@ -54,7 +58,12 @@ const CongratsStepContent = ({ isReferral }: Props) => {
...
@@ -54,7 +58,12 @@ const CongratsStepContent = ({ isReferral }: Props) => {
},
},
].map(({ title, value }) => (
].map(({ title, value }) => (
<Flex key={ title } alignItems="center">
<Flex key={ title } alignItems="center">
<IconSvg name="merits_colored" boxSize={ 8 }/>
<Icon
as={ meritsIcon }
boxSize={ 8 }
mb={ -0.5 }
filter="drop-shadow(0px 2px 2px rgba(21, 57, 103, 0.1))"
/>
<Skeleton isLoaded={ !rewardsConfigQuery.isLoading }>
<Skeleton isLoaded={ !rewardsConfigQuery.isLoading }>
<Text fontSize="sm" fontWeight="700" color="blue.700">
<Text fontSize="sm" fontWeight="700" color="blue.700">
+{ value }
+{ value }
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment