Skip to content

Commit

Permalink
Merge pull request #1548 from thehyve/ui-improvements
Browse files Browse the repository at this point in the history
Add improvements following the UI 2.0 feedback document.
  • Loading branch information
ewelinagr authored Aug 21, 2024
2 parents cda0534 + eaba481 commit 952178a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 15 deletions.
2 changes: 1 addition & 1 deletion projects/mercury/src/dashboard/DashboardPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const DashboardPage = props => {
<Typography className={classes.header} variant="h4" paragraph align="center">
About
</Typography>
<Typography variant="body1" paragraph>
<Typography variant="body1" paragraph align="center">
{APPLICATION_NAME} version: {process.env.REACT_APP_VERSION}
</Typography>
<Typography variant="body2" paragraph className={classes.footer} align="center">
Expand Down
3 changes: 2 additions & 1 deletion projects/mercury/src/dashboard/DomainInfo.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ const styles = theme => ({
},
icon: {
marginLeft: 10,
marginTop: 10
marginTop: 10,
color: theme.palette.primary.contrastText
},
imageIconRoot: {
marginTop: 10,
Expand Down
7 changes: 1 addition & 6 deletions projects/mercury/src/file/FileVersionsList.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,7 @@ const FileVersionsList = ({selectedFile, onRevertVersion, isWritingEnabled, clas
);

const renderHeader = ({label}) => (
<TableCell
component="div"
className={`${classes.tableCell} ${classes.tableHeaderRow}`}
variant="head"
align="left"
>
<TableCell component="div" className={classes.tableCell} variant="head" align="left">
{label}
</TableCell>
);
Expand Down
2 changes: 1 addition & 1 deletion projects/mercury/src/layout/Layout.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const styles = theme => ({
backgroundColor: theme.palette.background.default,
paddingTop: 14,
paddingBottom: 14,
paddingRight: 0,
paddingRight: 8,
minWidth: 0, // So the Typography noWrap works
overflowY: 'scroll',
overflowX: 'hidden',
Expand Down
5 changes: 0 additions & 5 deletions projects/mercury/src/metadata/views/MetadataViewTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ type MetadataViewTableProperties = {
};

const useStyles = makeStyles(() => ({
headerRow: {
'& .MuiTableCell-root': {
borderRadius: 20
}
},
headerCellContents: {
verticalAlign: 'top',
whiteSpace: 'nowrap'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ const styles = theme => ({
overflowX: 'auto',
'& .MuiTableCell-stickyHeader': {
backgroundColor: theme.palette.background.default
}
},
borderRadius: theme.shape.borderRadius
},
tableFooter: {
flex: 1
Expand Down

0 comments on commit 952178a

Please sign in to comment.