From b85b351b998718e1514596d6f03aed3cc0c0eda2 Mon Sep 17 00:00:00 2001 From: nikolai Date: Mon, 9 Dec 2024 14:32:56 +0400 Subject: [PATCH 1/2] fix: UILD-421: Multiple instances: style, navigation fixes --- src/components/FullDisplay/FullDisplay.scss | 2 +- .../InstancesList/InstancesList.scss | 20 ++++++++++++++----- src/components/Preview/TitledPreview.tsx | 3 +-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/components/FullDisplay/FullDisplay.scss b/src/components/FullDisplay/FullDisplay.scss index 9bd0bf35..e01e8586 100644 --- a/src/components/FullDisplay/FullDisplay.scss +++ b/src/components/FullDisplay/FullDisplay.scss @@ -9,7 +9,7 @@ .preview-contents-container { height: 100%; overflow-y: scroll; - padding: 0.938rem; + padding: 0.938rem 0; padding-bottom: 4rem; } diff --git a/src/components/InstancesList/InstancesList.scss b/src/components/InstancesList/InstancesList.scss index c111e2dd..8e55610d 100644 --- a/src/components/InstancesList/InstancesList.scss +++ b/src/components/InstancesList/InstancesList.scss @@ -24,19 +24,29 @@ } tr { - padding: 0.5rem 0 + padding: 0.5rem 0; } - .button-primary { - margin: 0.4rem 0; + .publisher, + .publication-date { + max-width: 10rem; } - .button-link { - text-decoration: underline; + .title { + .button-link { + text-decoration: underline; + text-align: left; + height: 100%; + } } .edit-ctl { width: 0.5rem; + + .button-primary { + margin: 0.4rem 0; + font-weight: 600; + } } td { diff --git a/src/components/Preview/TitledPreview.tsx b/src/components/Preview/TitledPreview.tsx index d11833d0..07b60d3f 100644 --- a/src/components/Preview/TitledPreview.tsx +++ b/src/components/Preview/TitledPreview.tsx @@ -49,7 +49,6 @@ export const TitledPreview = ({ ); const navigateToOwnEditPage = () => selectedOwnId && navigateToEditPage(generateEditResourceUrl(selectedOwnId)); - const navigateToRefEditPage = () => refId && navigateToEditPage(generateEditResourceUrl(refId)); return (
@@ -66,7 +65,7 @@ export const TitledPreview = ({ type={ButtonType.Primary} className="toggle-entity-edit" data-testid="edit-self-as-ref" - onClick={navigateToRefEditPage} + onClick={navigateToOwnEditPage} > From 14534e038761879d449a028a7bf2ec806b455530 Mon Sep 17 00:00:00 2001 From: nikolai Date: Mon, 9 Dec 2024 16:02:59 +0400 Subject: [PATCH 2/2] remove resource type label within titled preview --- src/components/Preview/Preview.scss | 4 +--- src/components/Preview/TitledPreview.tsx | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/components/Preview/Preview.scss b/src/components/Preview/Preview.scss index 0b583c83..a9dbc66a 100644 --- a/src/components/Preview/Preview.scss +++ b/src/components/Preview/Preview.scss @@ -102,9 +102,7 @@ } .details { - display: flex; - flex-direction: column; - align-items: center; + padding: 0.7rem; h5 { font-size: 0.95rem; diff --git a/src/components/Preview/TitledPreview.tsx b/src/components/Preview/TitledPreview.tsx index 07b60d3f..e4cbc0d6 100644 --- a/src/components/Preview/TitledPreview.tsx +++ b/src/components/Preview/TitledPreview.tsx @@ -39,11 +39,6 @@ export const TitledPreview = ({ )}
{title &&
{title}
} - {type && ( - - - - )}
);