Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
} from 'react-icons/ai'
import { VscGithubInverted, VscGithubAlt } from 'react-icons/vsc'
import { IoLogoDeviantart } from 'react-icons/io5'
import mousePointerOK from '../assets/mousePointerOK.png'
import mouseGrab from '../assets/mouseGrab.png'

const Footer = () => {
const location = useLocation()
Expand Down Expand Up @@ -83,8 +85,8 @@ const Footer = () => {
<Link
href='https://www.deviantart.com/rinoayk'
target='_blank'
rel='noopener noreferrer'
>
rel='noopener noreferrer'
>
{devianIcon}
</Link>
</Flex>
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal/AlertEasterEgg.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const AlertEasterEgg = ({ isOpen, onClose }) => {
fontFamily='poppins'
fontStyle='bold'
fontWeight='700'
color={colorMode === 'light' ? 'light.white' : 'dark.pTitle'}
color={colorMode === 'light' ? 'black' : 'dark.pTitle'}
>
<Text fontSize='48px'>Parabéns!!</Text>
<Text fontSize='20px'>Você capturou 10 Pokémons!</Text>
Expand Down
8 changes: 5 additions & 3 deletions src/components/modal/AlertEasterEggComlplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ const AlertEasterEggComlplete = ({
>
<Text
fontSize='48px'
color={colorMode === 'light' ? 'light.white' : 'dark.pTitle'}
color='black'
>
Parabéns!!
</Text>
<Text
fontSize='20px'
color={colorMode === 'light' ? 'light.white' : 'dark.pTitle'}
color='black'
>
Você venceu!
</Text>
Expand All @@ -67,10 +67,11 @@ const AlertEasterEggComlplete = ({
fontStyle='bold'
mt='1em'
direction='column'

>
<Text
textAlign='center'
color={colorMode === 'light' ? 'light.white' : 'dark.pTitle'}
color='black'
>
Jogar de novo?
</Text>
Expand All @@ -79,6 +80,7 @@ const AlertEasterEggComlplete = ({
<ModalFooter mt='0.5em'>
<Button
fontWeight='400'
color= 'white'
bg='#1DA1F2'
_hover={{
boxShadow: 'md',
Expand Down
5 changes: 3 additions & 2 deletions src/components/modal/AlertExcluirAll.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ const AlertExcluirAll = ({ isOpen, onClose }) => {
alt='Pikachu triste'
borderRadius='1em'
/>
<Text
<Text
fontSize='24px'
fontWeight='bold'
align='center'
mt='0.5em'
lineHeight='24px'
color={colorMode === 'light' ? 'light.white' : 'dark.pTitle'}
color={colorMode === 'light' ? 'black': 'light.white'}
>
Você realmente quer mandar seus pokémons embora?
</Text>
Expand All @@ -97,6 +97,7 @@ const AlertExcluirAll = ({ isOpen, onClose }) => {
<ModalFooter mt='-0.5em'>
<Button
fontWeight='400'
color='white'
bg='#1DA1F2'
_hover={{
boxShadow: 'md',
Expand Down
6 changes: 5 additions & 1 deletion src/pages/Pokedex.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import mouseWarning2 from '../../src/assets/mouseWarning2.gif'
import mousePointerOK from '../../src/assets/mousePointerOK.png'
import mouseDetalhes from '../../src/assets/mouseDetalhes.gif'
import mouseDetalhesActive from '../../src/assets/mouseDetalhesActive.gif'
import mouseGrab from '../../src/assets/mouseGrab.png'
import rotomDex from '../../src/assets/rotomDex.gif'
import RotomDexIco from '../../src/assets/rotomDexIco.ico'

Expand Down Expand Up @@ -306,7 +307,10 @@ const Pokedex = () => {
opacity={0.3}
>
<ChevronLeftIcon boxSize={8} mt='0.5' />
<Text fontSize='24px' fontWeight='bold' fontFamily='poppins'>
<Text fontSize='24px' fontWeight='bold' fontFamily='poppins'
cursor={`url(${mousePointerOK}), auto`}
_active={{ cursor: `url(${mouseGrab}), auto` }}
>
Voltar e capturar pokemóns!
</Text>
</Flex>
Expand Down
3 changes: 1 addition & 2 deletions src/styles/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ const customTheme = {
'*': {
cursor: `url(${mouseDefault}), default`
},

"button, [role='button']": {
cursor: `url(${mousePointerOK}), auto`
},
Expand All @@ -68,7 +67,7 @@ const customTheme = {
},
option: {
cursor: `url(${mousePointerOK}), pointer`
}
},
},

radii: {
Expand Down