From 6398258b384e94a2c24006592bbe4daf32f2e8fb Mon Sep 17 00:00:00 2001 From: Jeff McMillen Date: Thu, 12 Dec 2024 10:45:46 -0600 Subject: [PATCH 1/7] Resized View Full Path link in modals --- .../DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx | 3 ++- client/src/components/_common/Button/Button.jsx | 1 + client/src/components/_common/Button/Button.module.css | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx b/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx index 636a4e5f7..62802da2c 100644 --- a/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx +++ b/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx @@ -14,6 +14,7 @@ import { useSystems, } from 'hooks/datafiles'; import truncateMiddle from 'utils/truncateMiddle'; +import styles from '../../../components/_common/Button/Button.module.css'; const BreadcrumbLink = ({ api, @@ -195,7 +196,7 @@ const DataFilesBreadcrumbs = ({ )} {systemName && api === 'tapis' && ( - )} diff --git a/client/src/components/_common/Button/Button.jsx b/client/src/components/_common/Button/Button.jsx index da102f18a..948811831 100644 --- a/client/src/components/_common/Button/Button.jsx +++ b/client/src/components/_common/Button/Button.jsx @@ -21,6 +21,7 @@ export const SIZE_MAP = { long: 'width-long', auto: 'width-auto', small: 'size-small', + modalButton: 'modalButton', }; export const SIZES = [''].concat(Object.keys(SIZE_MAP)); diff --git a/client/src/components/_common/Button/Button.module.css b/client/src/components/_common/Button/Button.module.css index ea2b24bd8..4a4370cbf 100644 --- a/client/src/components/_common/Button/Button.module.css +++ b/client/src/components/_common/Button/Button.module.css @@ -39,6 +39,10 @@ font-size: 1rem; } +.modalButton { + font-size: 0.75rem !important; +} + .icon--before { composes: c-button__icon--before from '../../../styles/components/c-button--new.css'; } From 8703aeb4a1aabb1b4897e6b7c325cee722fdbd3a Mon Sep 17 00:00:00 2001 From: Jeff McMillen Date: Thu, 12 Dec 2024 11:31:21 -0600 Subject: [PATCH 2/7] Linted code --- .../DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx b/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx index 62802da2c..8300e0774 100644 --- a/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx +++ b/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx @@ -196,7 +196,11 @@ const DataFilesBreadcrumbs = ({ )} {systemName && api === 'tapis' && ( - )} From c3962b87d2bb16b2785d66b9fd3e1d73d3e9039d Mon Sep 17 00:00:00 2001 From: Jeff McMillen Date: Wed, 18 Dec 2024 13:17:45 -0600 Subject: [PATCH 3/7] Correctly sized the View Full Path as-link button in modals --- .../CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss | 4 ++++ .../DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx | 2 -- .../DataFiles/DataFilesModals/DataFilesModals.scss | 4 +++- client/src/components/_common/Button/Button.jsx | 1 - client/src/components/_common/Button/Button.module.css | 6 ++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss b/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss index 7898fea1f..215f2e73d 100644 --- a/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss +++ b/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss @@ -3,3 +3,7 @@ align-items: center; gap: 1rem; } + +.combined-breadcrumbs .breadcrumb-container button { + font-size: 1rem; +} diff --git a/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx b/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx index 8300e0774..e0064c7a9 100644 --- a/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx +++ b/client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx @@ -14,7 +14,6 @@ import { useSystems, } from 'hooks/datafiles'; import truncateMiddle from 'utils/truncateMiddle'; -import styles from '../../../components/_common/Button/Button.module.css'; const BreadcrumbLink = ({ api, @@ -198,7 +197,6 @@ const DataFilesBreadcrumbs = ({ {systemName && api === 'tapis' && ( )} From f3b0cb7a612179284664b80e4c123846c0d95423 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:45:25 -0600 Subject: [PATCH 5/7] fix: misspelling --- .../components/DataFiles/DataFilesModals/DataFilesModals.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss b/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss index f88812424..7c0259390 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss @@ -9,7 +9,7 @@ .h-100 { padding: 0 10px; } - .breadcrumbs-container { + .breadcrumb-container { font-size: 1.2rem; } .breadcrumbs { From e87e3e57983b14dfc6afca278d70c1c1a1df5101 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:45:41 -0600 Subject: [PATCH 6/7] fix: my bad math --- .../components/DataFiles/DataFilesModals/DataFilesModals.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss b/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss index 7c0259390..25da7589d 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesModals.scss @@ -10,7 +10,7 @@ padding: 0 10px; } .breadcrumb-container { - font-size: 1.2rem; + font-size: 0.75rem; } .breadcrumbs { padding-top: 5px; From a9c89afcd1970c7cfceb2e22865246e263436750 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:50:22 -0600 Subject: [PATCH 7/7] fix: combinedbreadcumbs css mis-compiles global class --- .../CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss b/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss index 215f2e73d..8edbb9a23 100644 --- a/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss +++ b/client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.module.scss @@ -4,6 +4,6 @@ gap: 1rem; } -.combined-breadcrumbs .breadcrumb-container button { +.combined-breadcrumbs :global(.breadcrumb-container) button { font-size: 1rem; }