Skip to content

Commit

Permalink
Merge branch 'master' of github.com:quiltdata/quilt into crossbucket-…
Browse files Browse the repository at this point in the history
…push-frontend
  • Loading branch information
fiskus committed Dec 2, 2020
2 parents 612d82d + 78a615b commit eb70237
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions catalog/app/containers/Bucket/PackageCreateDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,9 @@ function PackageCreateDialog({ bucket, open, workflowsConfig, onClose, refresh }
scroll="body"
onExited={reset(form)}
>
<M.DialogTitle>{success ? 'Push complete' : 'Push package'}</M.DialogTitle>
<M.DialogTitle>
{success ? 'Package created' : 'Create package'}
</M.DialogTitle>
{success ? (
<>
<M.DialogContent style={{ paddingTop: 0 }}>
Expand Down Expand Up @@ -629,7 +631,7 @@ function PackageCreateDialog({ bucket, open, workflowsConfig, onClose, refresh }
color="primary"
disabled={submitting || (submitFailed && hasValidationErrors)}
>
Push
Create
</M.Button>
</M.DialogActions>
</>
Expand Down
4 changes: 2 additions & 2 deletions catalog/app/containers/Bucket/PackageList.js
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ export default function PackageList({
<M.Typography variant="h4">No packages</M.Typography>
<M.Box pt={3} />
<M.Button variant="contained" color="primary" onClick={openUpload}>
Push package
Create package
</M.Button>
<M.Box pt={2} />
<M.Typography>
Expand Down Expand Up @@ -490,7 +490,7 @@ export default function PackageList({
style={{ paddingTop: 7, paddingBottom: 7 }}
onClick={openUpload}
>
Push package
Create package
</M.Button>
</M.Box>
<M.Box component={M.Paper} className={classes.paper}>
Expand Down

0 comments on commit eb70237

Please sign in to comment.