projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14129-inputs-modal-new
[arvados.git]
/
src
/
components
/
collection-panel-files
/
collection-panel-files.tsx
diff --git
a/src/components/collection-panel-files/collection-panel-files.tsx
b/src/components/collection-panel-files/collection-panel-files.tsx
index d08d36d6bb80c07ce1a3074449c883c619f94299..9a534e4bcba8a1fcf24dd09f1d0b32fc53fdf1fa 100644
(file)
--- a/
src/components/collection-panel-files/collection-panel-files.tsx
+++ b/
src/components/collection-panel-files/collection-panel-files.tsx
@@
-19,7
+19,7
@@
export interface CollectionPanelFilesProps {
onCollapseToggle: (id: string, status: TreeItemStatus) => void;
}
onCollapseToggle: (id: string, status: TreeItemStatus) => void;
}
-type CssRules = 'root' | 'cardSubheader' | 'nameHeader' | 'fileSizeHeader' | 'uploadIcon';
+type CssRules = 'root' | 'cardSubheader' | 'nameHeader' | 'fileSizeHeader' | 'uploadIcon'
| 'button'
;
const styles: StyleRulesCallback<CssRules> = theme => ({
root: {
const styles: StyleRulesCallback<CssRules> = theme => ({
root: {
@@
-37,6
+37,10
@@
const styles: StyleRulesCallback<CssRules> = theme => ({
},
uploadIcon: {
transform: 'rotate(180deg)'
},
uploadIcon: {
transform: 'rotate(180deg)'
+ },
+ button: {
+ marginRight: -theme.spacing.unit,
+ marginTop: '0px'
}
});
}
});
@@
-46,19
+50,20
@@
export const CollectionPanelFiles =
<Card className={classes.root}>
<CardHeader
title="Files"
<Card className={classes.root}>
<CardHeader
title="Files"
+ classes={{ action: classes.button }}
action={
<Button onClick={onUploadDataClick}
variant='raised'
color='primary'
size='small'>
action={
<Button onClick={onUploadDataClick}
variant='raised'
color='primary'
size='small'>
- <DownloadIcon className={classes.uploadIcon}/>
+ <DownloadIcon className={classes.uploadIcon}
/>
Upload data
</Button>
} />
<CardHeader
className={classes.cardSubheader}
action={
Upload data
</Button>
} />
<CardHeader
className={classes.cardSubheader}
action={
- <Tooltip title="More options">
+ <Tooltip title="More options"
disableFocusListener
>
<IconButton onClick={onOptionsMenuOpen}>
<CustomizeTableIcon />
</IconButton>
<IconButton onClick={onOptionsMenuOpen}>
<CustomizeTableIcon />
</IconButton>