Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Frontend-MECRED
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MECRED
Frontend-MECRED
Commits
800591ef
Commit
800591ef
authored
5 months ago
by
Richard Fernando Heise Ferreira
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue-264/change-font-colors-on-items-and-store' into 'develop'
Issue
#264
: UPDATE Charge font colors on items and store See merge request
!250
parents
a2000f1a
c1e0ae29
No related branches found
No related tags found
1 merge request
!250
Issue #264: UPDATE Charge font colors on items and store
Pipeline
#41308
passed
5 months ago
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/perfil/[id]/components/ProfileAchievementsMenu.js
+1
-1
1 addition, 1 deletion
src/app/perfil/[id]/components/ProfileAchievementsMenu.js
src/app/perfil/[id]/components/ProfileItens.js
+5
-5
5 additions, 5 deletions
src/app/perfil/[id]/components/ProfileItens.js
with
6 additions
and
6 deletions
src/app/perfil/[id]/components/ProfileAchievementsMenu.js
+
1
−
1
View file @
800591ef
...
...
@@ -36,7 +36,7 @@ export default function ProfileAchievementsMenu({profileData, achievements, prog
<
div
key
=
{
index
}
className
=
"
flex flex-col text-main-text max-xl:p-0.5
"
>
<
button
className
=
{
`flex w-[276px] h-[54px] max-xl:w-[180px] max-xl:h-[45px] justify-center items-center rounded-[10px] text-base font-bold transition-all outline outline-1 outline-outlineColor
${
selectedMenu
===
itens
?
"
bg-secondary text-white
"
:
"
bg-bg-comments
"
}
`
}
${
selectedMenu
===
itens
?
"
bg-secondary
hover:bg-secondary-hover
text-white
"
:
"
bg-bg-comments
text-text-filter hover:bg-text-filter hover:text-white
"
}
`
}
onClick
=
{()
=>
setSelectedMenu
(
itens
)}
>
{
itens
}
<
/button
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
src/app/perfil/[id]/components/ProfileItens.js
+
5
−
5
View file @
800591ef
...
...
@@ -277,9 +277,9 @@ export default function ProfileItens({ profileData, setItems, items, store, type
<
h1
className
=
"
flex text-lg text-text-filter text-[100%] font-bold px-6 items-center min-h-[40px]
"
>
{
e
.
item
?.
name
||
e
.
name
}
<
/h1
>
<
button
className
=
"
text-
main-text
pb-2
"
onClick
=
{()
=>
setShowDescription
(
index
)}
>
Ver
mais
<
/button
>
<
button
className
=
"
text-
secondary hover:text-secondary-hover
pb-2
"
onClick
=
{()
=>
setShowDescription
(
index
)}
>
Ver
mais
<
/button
>
<
div
className
=
'
flex flex-wrap gap-x-4
'
>
<
h1
className
=
'
flex text-
main-text
font-bold gap-x-1
'
>
{
iconEggs
}{
e
.
price
}
<
/h1
>
<
h1
className
=
'
flex text-
text-filter
font-bold gap-x-1
'
>
{
iconEggs
}{
e
.
price
}
<
/h1
>
<
/div
>
<
ModalBuyItem
name
=
{
e
.
name
}
...
...
@@ -289,7 +289,7 @@ export default function ProfileItens({ profileData, setItems, items, store, type
index
=
{
index
}
id
=
{
e
.
id
}
/
>
<
button
className
=
"
flex h-[43px] w-[158px] justify-center items-center bg-bg-comments rounded-[10px] outline outline-1 outline-outlineColor font-bold text-
main-text
mt-2
"
<
button
className
=
"
flex h-[43px] w-[158px] justify-center items-center bg-bg-comments
hover:bg-text-filter
rounded-[10px] outline outline-1 outline-outlineColor font-bold text-
text-filter hover:text-white
mt-2
"
onClick
=
{()
=>
!
arrayAcquired
[
index
]
&&
setBuyItem
(
e
.
id
)}
>
{
arrayAcquired
[
index
]
?
"
Adquirido
"
:
"
Comprar
"
}
...
...
@@ -300,8 +300,8 @@ export default function ProfileItens({ profileData, setItems, items, store, type
<
h1
className
=
"
flex text-lg text-text-filter text-[100%] font-bold px-6 items-center min-h-[60px]
"
>
{
e
.
item
?.
name
||
e
.
name
}
<
/h1
>
<
button
className
=
"
text-
main-text
"
onClick
=
{()
=>
setShowDescription
(
index
)}
>
Ver
mais
<
/button
>
<
button
className
=
"
flex h-[43px] w-[158px] justify-center items-center bg-bg-comments rounded-[10px] outline outline-1 outline-outlineColor font-bold text-
main-text
mt-4
"
<
button
className
=
"
text-
secondary hover:text-secondary-hover
"
onClick
=
{()
=>
setShowDescription
(
index
)}
>
Ver
mais
<
/button
>
<
button
className
=
"
flex h-[43px] w-[158px] justify-center items-center bg-bg-comments
hover:bg-text-filter
rounded-[10px] outline outline-1 outline-outlineColor font-bold text-
text-filter hover:text-white
mt-4
"
onClick
=
{()
=>
handlePostRequestItem
(
e
.
item
?.
id
||
null
,
e
.
being_used
?
"
unequip_item
"
:
"
equip_item
"
,
index
)}
>
{
e
.
being_used
?
"
Desequipar
"
:
"
Equipar
"
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment