Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Nav style fixes for storage mobile view #2185

Merged
merged 1 commit into from
Jun 14, 2022
Merged

Nav style fixes for storage mobile view #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 59 additions & 29 deletions packages/storage-ui/src/Components/Layouts/AppNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,30 +143,40 @@ const useStyles = makeStyles(
borderRadius: "4px",
transitionDuration: `${animation.transform}ms`,
"& span": {
color: constants.nav.itemColor,
[breakpoints.up("md")]: {
color: constants.nav.itemColor
},
[breakpoints.down("md")]: {
color: palette.additional["gray"][3]
color: constants.nav.itemColorHover
}
},
"& svg": {
"& path": {
fill: constants.nav.headingColor
},
width: Number(constants.svgWidth),
marginRight: constants.generalUnit * 2,
fill: constants.nav.itemIconColor,
[breakpoints.up("md")]: {
fill: constants.nav.itemIconColor
},
[breakpoints.down("md")]: {
fill: palette.additional["gray"][3]
fill: constants.nav.itemIconColorHover
}
},
"&:hover": {
backgroundColor: palette.additional["gray"][5]
backgroundColor: palette.additional["gray"][5],
[breakpoints.down("md")]: {
color: constants.nav.backgroundColor
}
},
"&.selected": {
backgroundColor: palette.additional["gray"][5],
[breakpoints.down("md")]: {
"& span": {
color: palette.additional["gray"][9]
color: constants.nav.mobileSelectedBackground
},
"& svg": {
fill: palette.additional["gray"][9]
fill: constants.nav.mobileSelectedBackground
}
}
}
Expand All @@ -176,17 +186,42 @@ const useStyles = makeStyles(
display: "flex",
flexDirection: "row",
alignItems: "center",
color: constants.header.menuItemTextColor,
"& svg": {
width: constants.generalUnit * 2,
height: constants.generalUnit * 2,
marginRight: constants.generalUnit
marginRight: constants.generalUnit,
fill: palette.additional["gray"][7],
stroke: palette.additional["gray"][7]
}
},
spaceUsedText: {
marginBottom: constants.generalUnit,
[breakpoints.down("md")]: {
color: palette.additional["gray"][5]
}
},
spaceUsedMargin: {
marginBottom: constants.generalUnit
marginBottom: constants.generalUnit * 2
},
betaCaption: {
marginBottom: constants.generalUnit * 0.5
},
bottomSection: {
[breakpoints.down("md")]: {
marginBottom: constants.generalUnit * 2
}
},
logoutButton: {
backgroundColor: palette.additional["gray"][5],
"& span": {
marginRight: constants.generalUnit * 0.5
},
"& svg": {
width: constants.generalUnit * 2,
height: constants.generalUnit * 2,
fill: palette.additional["gray"][9]
}
}
})
}
Expand Down Expand Up @@ -309,16 +344,14 @@ const AppNav: React.FC<IAppNav> = ({ navOpen, setNavOpen }: IAppNav) => {
</a>
</nav>
</div>
<section>
<div
data-cy="label-space-used"
>
<section className={classes.bottomSection}>
<div data-cy="label-space-used">
{
storageSummary && (
<>
<Typography
variant="body2"
className={classes.spaceUsedMargin}
className={classes.spaceUsedText}
component="p"
>{`${formatBytes(storageSummary.used_storage, 2)} of ${formatBytes(
storageSummary.total_storage, 2
Expand All @@ -334,21 +367,18 @@ const AppNav: React.FC<IAppNav> = ({ navOpen, setNavOpen }: IAppNav) => {
}
</div>
{!desktop && (

<div style={{ display: "flex" }}>
<Button
data-cy="button-sign-out"
variant='secondary'
onClick={() => {
handleOnClick()
signOut()
}}
size='small'
>
<PowerDownIcon />
<Trans>Log out</Trans>
</Button>
</div>
<Button
data-cy="button-sign-out"
onClick={() => {
handleOnClick()
signOut()
}}
className={classes.logoutButton}
variant="tertiary"
>
<PowerDownIcon />
<Trans>Log out</Trans>
</Button>
)}
</section>
{!desktop && (
Expand Down
2 changes: 1 addition & 1 deletion packages/storage-ui/src/Components/Pages/BucketsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const useStyles = makeStyles(({ breakpoints, animation, constants, typography }:
justifyContent: "space-between",
alignItems: "center",
[breakpoints.down("md")]: {
marginTop: constants.generalUnit
margin: `${constants.generalUnit}px ${constants.generalUnit * 2}px 0`
}
},
modalRoot: {
Expand Down
1 change: 1 addition & 0 deletions packages/storage-ui/src/Themes/Constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export interface CsSColors extends IConstants {
itemColorHover: string
itemIconColor: string
itemIconColorHover: string
mobileSelectedBackground: string
profileButtonShadow: string
}
createFolder: {
Expand Down
3 changes: 2 additions & 1 deletion packages/storage-ui/src/Themes/LightTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ export const lightTheme = createTheme<CsSColors>({
mobileBackgroundColor: "var(--gray9)",
headingColor: "inherit",
itemColor: "inherit",
itemColorHover: "var(--gray7)",
itemIconColor: "inherit",
itemColorHover: "var(--gray6)",
itemIconColorHover: "var(--gray7)",
mobileSelectedBackground: "var(--gray9)",
profileButtonShadow: "0px 1px 2px rgba(0, 0, 0, 0.25)"
},
createFolder: {
Expand Down