From 38245400dde936f3cdfc46617003e012e311c1e9 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Wed, 23 Oct 2024 15:54:45 -0400 Subject: [PATCH] 22207: united panel name styles and removed unused css class Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- .../data-explorer/data-explorer.tsx | 20 +++++++++---------- .../workflow-processes-panel-root.tsx | 3 ++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx index c44340c0b2..91a46893a2 100644 --- a/services/workbench2/src/components/data-explorer/data-explorer.tsx +++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx @@ -44,12 +44,12 @@ type CssRules = | 'root' | 'moreOptionsButton' | 'title' - | 'subProcessTitle' | 'dataTable' | 'container' | 'paginationLabel' | 'paginationRoot' - | "subToolbarWrapper" + | "subToolbarWrapper" + | 'runsToolbarWrapper' | 'searchResultsToolbar' | 'progressWrapper' | 'progressWrapperNoTitle'; @@ -60,6 +60,7 @@ const styles: CustomStyleRulesCallback = (theme: ArvadosTheme) => ({ justifyContent: "space-between", marginTop: "5px", marginBottom: "-5px", + // border: "1px solid red", }, msToolbarStyles: { marginLeft: "-5px", @@ -68,6 +69,10 @@ const styles: CustomStyleRulesCallback = (theme: ArvadosTheme) => ({ marginTop: "5px", marginLeft: "-15px", }, + runsToolbarWrapper: { + marginTop: "5px", + marginLeft: "-15px", + }, searchResultsToolbar: { marginTop: "10px", marginBottom: "auto", @@ -102,13 +107,6 @@ const styles: CustomStyleRulesCallback = (theme: ArvadosTheme) => ({ minWidth: '8.5rem', }, title: { - display: "inline-block", - paddingLeft: theme.spacing(2), - paddingTop: theme.spacing(2), - fontSize: "18px", - paddingRight: "10px", - }, - subProcessTitle: { display: "inline-block", paddingLeft: theme.spacing(2), paddingTop: theme.spacing(2), @@ -302,7 +300,7 @@ export const DataExplorer = withStyles(styles)( {title} @@ -312,7 +310,7 @@ export const DataExplorer = withStyles(styles)( ? : ) + injectedStyles={classNames(panelName === 'Subprocesses' ? classes.subToolbarWrapper : panelName === 'Runs' ? classes.runsToolbarWrapper : '')}/>) } {(!hideColumnSelector || !hideSearchInput || !!actions) && ( = (theme: ArvadosTheme) => ({ }, cardHeader: { display: 'flex', - marginBottom: '10px', + marginTop: '-5px', + marginBottom: '15px', }, }); -- 2.30.2