From db19d8e95c6f51b06feaba165eb9b1c00e457ab3 Mon Sep 17 00:00:00 2001 From: Konstantin Schaper Date: Fri, 7 Aug 2020 12:17:42 +0200 Subject: [PATCH] fix styling issues --- scm-ui/ui-components/src/popover/Popover.tsx | 1 - .../ui-components/src/repos/changesets/SignatureIcon.tsx | 8 ++++---- .../src/users/components/publicKeys/PublicKeyEntry.tsx | 9 +-------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/scm-ui/ui-components/src/popover/Popover.tsx b/scm-ui/ui-components/src/popover/Popover.tsx index 5f12cccd00..797d9aef53 100644 --- a/scm-ui/ui-components/src/popover/Popover.tsx +++ b/scm-ui/ui-components/src/popover/Popover.tsx @@ -63,7 +63,6 @@ const PopoverContainer = styled.div` margin-top: -0.4rem; -webkit-transform-origin: center; transform-origin: center; - box-shadow: -1px 1px 2px rgba(10, 10, 10, 0.2); transform: rotate(-45deg); } `; diff --git a/scm-ui/ui-components/src/repos/changesets/SignatureIcon.tsx b/scm-ui/ui-components/src/repos/changesets/SignatureIcon.tsx index f79e6dd413..637247d0b2 100644 --- a/scm-ui/ui-components/src/repos/changesets/SignatureIcon.tsx +++ b/scm-ui/ui-components/src/repos/changesets/SignatureIcon.tsx @@ -89,14 +89,14 @@ const SignatureIcon: FC = ({signatures, className}) => { const signatureElements = signatures.map(signature => createSignatureBlock(signature)); const getColor = () => { - const verified = signatures.some(sig => sig.status === "VERIFIED"); - if (verified) { - return "success"; - } const invalid = signatures.some(sig => sig.status === "INVALID"); if (invalid) { return "danger"; } + const verified = signatures.some(sig => sig.status === "VERIFIED"); + if (verified) { + return "success"; + } return undefined; }; diff --git a/scm-ui/ui-webapp/src/users/components/publicKeys/PublicKeyEntry.tsx b/scm-ui/ui-webapp/src/users/components/publicKeys/PublicKeyEntry.tsx index 8ef703752f..d47d0078ac 100644 --- a/scm-ui/ui-webapp/src/users/components/publicKeys/PublicKeyEntry.tsx +++ b/scm-ui/ui-webapp/src/users/components/publicKeys/PublicKeyEntry.tsx @@ -43,12 +43,6 @@ export const PublicKeyEntry: FC = ({ publicKey, onDelete }) => { onDelete((publicKey._links.delete as Link).href)} /> ); } - let downloadButton; - if (publicKey?._links?.raw) { - downloadButton = ( - - ); - } return ( <> @@ -57,9 +51,8 @@ export const PublicKeyEntry: FC = ({ publicKey, onDelete }) => { - {publicKey.id} + {publicKey._links?.raw ? {publicKey.id} : publicKey.id} {deleteButton} - {downloadButton} );