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

UI layout adjustments and sticky bulk actions #2074

Merged
merged 5 commits into from
Apr 10, 2022
Merged

UI layout adjustments and sticky bulk actions #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbf2f85
sticky actions
tanmoyAtb Apr 5, 2022
3992e8a
Merge branch 'dev' into feat/bulk-actions-appearance-2052
asnaith Apr 5, 2022
adf0166
storage changes
tanmoyAtb Apr 6, 2022
7495405
z indexes
tanmoyAtb Apr 6, 2022
f6c79bb
Merge branch 'dev' into feat/bulk-actions-appearance-2052
tanmoyAtb Apr 6, 2022
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
2 changes: 2 additions & 0 deletions packages/files-ui/src/Components/Modules/FileBrowsers/SharedFoldersOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const useStyles = makeStyles(
root: {
position: "relative",
[breakpoints.down("md")]: {
marginTop: constants.generalUnit * 4,
marginLeft: constants.generalUnit * 2,
marginRight: constants.generalUnit * 2,
"&.bottomBanner": {
Expand All @@ -46,6 +47,7 @@ const useStyles = makeStyles(
},
[breakpoints.up("md")]: {
border: "1px solid transparent",
marginTop: constants.generalUnit * 6,
padding: `0 ${constants.generalUnit}px`,
borderRadius: constants.generalUnit / 4,
minHeight: `calc(100vh - ${Number(constants.contentTopPadding)}px)`,
Expand Down
30 changes: 23 additions & 7 deletions packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ const useStyles = makeStyles(
backgroundColor: palette.additional["gray"][4]
},
[breakpoints.up("md")]: {
margin: `${constants.generalUnit * 3}px 0`
marginTop: constants.generalUnit * 3,
marginBottom: 0
},
[breakpoints.down("md")]: {
margin: `${constants.generalUnit * 3}px 0 0`
Expand Down Expand Up @@ -255,11 +256,19 @@ const useStyles = makeStyles(
bulkOperations: {
display: "flex",
flexDirection: "row",
marginTop: constants.generalUnit * 3,
marginBottom: constants.generalUnit * 3,
minHeight: constants.generalUnit * 4.2, // reserve space for buttons for the interface not to jump when they get visible
position: "sticky",
top: "80px",
backgroundColor: palette.additional["gray"][1],
zIndex: zIndex?.layer0,
minHeight: constants.generalUnit * 5 + 34,
alignItems: "center",
"& > *": {
marginRight: constants.generalUnit
},
[breakpoints.up("md")]: {
// prevent grid shadows overflow showing
marginLeft: "-4px",
paddingLeft: "4px"
}
},
confirmDeletionDialog: {
Expand All @@ -271,7 +280,6 @@ const useStyles = makeStyles(
gridColumnGap: constants.generalUnit * 2,
gridRowGap: constants.generalUnit * 2,
marginBottom: constants.generalUnit * 4,
marginTop: constants.generalUnit * 4,
[breakpoints.down("lg")]: {
gridTemplateColumns: "minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr)"
},
Expand Down Expand Up @@ -319,6 +327,14 @@ const useStyles = makeStyles(
},
checkIcon: {
fill: palette.additional.gray[8]
},
tableHead: {
position: "sticky",
top: constants.generalUnit * 5 + 34 + 80,
zIndex: zIndex?.layer0,
[breakpoints.down("md")]: {
top: 50
}
}
})
}
Expand Down Expand Up @@ -1053,7 +1069,7 @@ const FilesList = ({ isShared = false }: Props) => {
testId="home"
>
{desktop ? (
<TableHead>
<TableHead className={classes.tableHead}>
<TableRow
type="grid"
className={classes.tableRow}
Expand Down Expand Up @@ -1102,7 +1118,7 @@ const FilesList = ({ isShared = false }: Props) => {
</TableRow>
</TableHead>
) : (
<TableHead>
<TableHead className={classes.tableHead}>
<TableRow
type="grid"
className={classes.tableRow}
Expand Down
2 changes: 1 addition & 1 deletion packages/files-ui/src/Components/Modules/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const TabPane = (props: ITabPaneProps<SettingsPath>) => TabPaneOrigin(props)
const useStyles = makeStyles(({ constants, breakpoints, palette }: ITheme) =>
createStyles({
title: {
marginTop: constants.generalUnit,
marginTop: constants.generalUnit * 4,
[breakpoints.down("md")]: {
fontSize: 18,
lineHeight: "22px",
Expand Down
4 changes: 2 additions & 2 deletions packages/files-ui/src/Themes/Constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export const UI_CONSTANTS = {
mobileButtonHeight: 44,
headerHeight: 60,
navWidth: 8 * 27,
contentPadding: 8 * 15,
contentTopPadding: 8 * 15,
contentPadding: 6 * 15,
contentTopPadding: 6 * 15,
mobileHeaderHeight: 8 * 6.3,
svgWidth: 8 * 2.5,
topPadding: 8 * 3,
Expand Down
2 changes: 1 addition & 1 deletion packages/files-ui/src/Themes/DarkTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export const darkTheme = createTheme<CsfColors>({
filesTable: {
color: "var(--gray7)",
uploadText: "var(--gray7)",
gridItemShadow: "0px 4px 4px rgba(0, 0, 0, 0.25)"
gridItemShadow: "1px 1px 4px rgba(0, 0, 0, 0.25)"
},
fileSystemItemRow: {
icon: "var(--gray9)",
Expand Down
2 changes: 1 addition & 1 deletion packages/files-ui/src/Themes/LightTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export const lightTheme = createTheme<CsfColors>({
filesTable: {
color: "",
uploadText: "var(--gray2)",
gridItemShadow: "0px 4px 4px rgba(0, 0, 0, 0.25)"
gridItemShadow: "1px 1px 4px rgba(0, 0, 0, 0.25)"
},
fileSystemItemRow: {
icon: "var(--gray8)",
Expand Down
22 changes: 16 additions & 6 deletions packages/storage-ui/src/Components/Modules/FilesList/FilesList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ const useStyles = makeStyles(
backgroundColor: palette.additional["gray"][4]
},
[breakpoints.up("md")]: {
margin: `${constants.generalUnit * 3}px 0`
marginTop: constants.generalUnit * 3,
marginBottom: 0
},
[breakpoints.down("md")]: {
margin: `${constants.generalUnit * 3}px 0 0`
Expand Down Expand Up @@ -229,14 +230,15 @@ const useStyles = makeStyles(
opacity: 0.2,
transition: `opacity ${animation.transform * 3}ms`
},
tableHead: {
marginTop: constants.generalUnit * 3
},
bulkOperations: {
display: "flex",
flexDirection: "row",
marginTop: constants.generalUnit * 3,
minHeight: constants.generalUnit * 4.2, // reserve space for buttons for the interface not to jump when they get visible
position: "sticky",
top: "80px",
backgroundColor: palette.additional["gray"][1],
zIndex: zIndex?.layer0,
minHeight: constants.generalUnit * 5 + 34,
alignItems: "center",
"& > *": {
marginRight: constants.generalUnit
}
Expand Down Expand Up @@ -291,6 +293,14 @@ const useStyles = makeStyles(
},
buttonWrap: {
whiteSpace: "nowrap"
},
tableHead: {
position: "sticky",
top: constants.generalUnit * 5 + 34 + 80,
zIndex: zIndex?.layer0,
[breakpoints.down("md")]: {
top: 50
}
}
})
}
Expand Down
3 changes: 2 additions & 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 @@ -33,7 +33,8 @@ export const mobileGridSettings = "3fr 100px 100px 70px !important"
const useStyles = makeStyles(({ breakpoints, animation, constants, typography }: CSSTheme) =>
createStyles({
root: {
position: "relative"
position: "relative",
marginTop: constants.generalUnit * 2
},
tableHead: {
marginTop: 24
Expand Down
3 changes: 2 additions & 1 deletion packages/storage-ui/src/Components/Pages/CidsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export const mobileGridSettings = "2fr 3fr 180px 110px 80px 20px 70px !important
const useStyles = makeStyles(({ animation, breakpoints, constants }: CSSTheme) =>
createStyles({
root: {
position: "relative"
position: "relative",
marginTop: constants.generalUnit * 2
},
header: {
display: "flex",
Expand Down
4 changes: 2 additions & 2 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 @@ -4,8 +4,8 @@ export const UI_CONSTANTS = {
mobileButtonHeight: 44,
headerHeight: 60,
navWidth: 8 * 27,
contentPadding: 8 * 15,
contentTopPadding: 8 * 15,
contentPadding: 8 * 12,
contentTopPadding: 8 * 12,
mobileHeaderHeight: 8 * 6.3,
svgWidth: 8 * 2.5,
topPadding: 8 * 3,
Expand Down