Skip to content

Fix/navbar button class #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
12 changes: 10 additions & 2 deletions src/molecules/NavBarButtons/NavBarButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box } from '@chakra-ui/react'
import { Box, useMediaQuery } from '@chakra-ui/react'

import { vars } from '@theme'
import { HelpIcon } from '@/molecules/NavBarButtons/Icons/HelpIcon'
Expand Down Expand Up @@ -29,6 +29,8 @@
onClick,
type,
}: ButtonProps): JSX.Element => {
const [isMobile] = useMediaQuery('(max-width: 640px)')

const buttonType = {
accessibility: {
icon: <Accessibility />,
Expand Down Expand Up @@ -62,11 +64,16 @@
id={isAccessibility ? 'UserWayButton' : ''}
onClick={isAccessibility ? triggerWidget : onClick}
sx={{

Check failure on line 67 in src/molecules/NavBarButtons/NavBarButton.tsx

View workflow job for this annotation

GitHub Actions / test (14.21.3)

Delete `⏎`

Check failure on line 67 in src/molecules/NavBarButtons/NavBarButton.tsx

View workflow job for this annotation

GitHub Actions / test (14.21.3)

Delete `⏎`
background: 'none !important',
border: '1px transparent !important',

cursor: 'pointer',
display: 'flex',
gap: '8px',
h: '30px',
maxH: '30px',
p: '0',

_hover: {
'.nav-bar-icon': {
Expand Down Expand Up @@ -110,7 +117,8 @@
}}
>
<Box className="nav-bar-icon">{buttonType[type].icon}</Box>
<Box className="nav-bar-text">{buttonType[type].text}</Box>
{!isMobile && <Box className="nav-bar-text">{buttonType[type].text}</Box>}

Check failure on line 120 in src/molecules/NavBarButtons/NavBarButton.tsx

View workflow job for this annotation

GitHub Actions / test (14.21.3)

Delete `⏎`

Check failure on line 120 in src/molecules/NavBarButtons/NavBarButton.tsx

View workflow job for this annotation

GitHub Actions / test (14.21.3)

Delete `⏎`

</Box>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const CalendarDropdownContainer = ({
content: '""',
display: isMenuOpen ? 'block' : 'none',
height: '0',
left: '14%',
left: '11%',
position: 'absolute',
top: '30px',
transform: 'translateX(-50%)',
Expand Down Expand Up @@ -109,13 +109,13 @@ export const CalendarDropdownContainer = ({
border: 'none',
borderRadius: isMobile ? '0' : '10px',
boxShadow: isMobile ? 'none' : 'rgba(47, 47, 47, 0.2) -1px 6px 40px 0px',
left: isMobile ? 'auto' : '-30px',
left: isMobile ? 'auto' : '34pxpx',
maxHeight: isMobile ? 'calc(100vh - 62px)' : 'auto',
opacity: '1 !important',
overflowY: isMobile ? 'auto' : 'hidden',
padding: '0',
position: 'absolute',
top: isMobile ? '-6px !important' : 'auto',
top: isMobile ? '-6px !important' : '1px',
transform: 'none !important',
transition: 'none !important',
width: isMobile ? '100vw' : '500px',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export const GoToCalendar = ({ text, onlyToCalendar, onClick }: IGoToCalendar):
onClick={() => onlyToCalendar && onClick && onClick()}
position="relative"
sx={{
background: 'none',
border: '1px transparent',
_hover: {
'.nav-bar-icon': {
bg: hoverBg,
Expand Down
Loading