Merge remote-tracking branch 'remotes/origin/#423' into allfunctionality

m2ms · Nov 19, 2020 · f3b3e73 · f3b3e73
2 parents 417be8f + 4b3a052
commit f3b3e73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js/components/common/Surfaces/Panel/index.js b/js/components/common/Surfaces/Panel/index.js
@@ -114,7 +114,7 @@ export const Panel = memo(
                 {title && (
                   <Grid
                     item
-                    xs={hasExpansion || headerActions ? (headerActions && headerActions.length > 1 ? 5 : 6) : 12}
+                    xs={hasExpansion || headerActions ? (headerActions && headerActions.length > 1 ? 4 : 6) : 12}
                     className={classes.headerTitle}
                   >
                     {withTooltip ? (
@@ -136,7 +136,7 @@ export const Panel = memo(
                     container
                     direction="row"
                     justify="flex-end"
-                    xs={title ? (headerActions && headerActions.length > 1 ? 7 : 6) : 12}
+                    xs={title ? (headerActions && headerActions.length > 1 ? 8 : 6) : 12}
                   >
                     {headerActions &&
                       headerActions.map((action, index) => (

diff --git a/js/components/datasets/datasetMoleculeView.js b/js/components/datasets/datasetMoleculeView.js
@@ -739,7 +739,7 @@ export const DatasetMoleculeView = memo(
                             setRef(ref.current);
                           }
                         }}
-                        disabled={true}
+                        disabled={disableUserInteraction}
                       >
                         X
                       </Button>