From 329191556891999b7082c55bcb240e55ae64b801 Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 27 Apr 2022 20:46:39 +0200 Subject: [PATCH] Change the size of large tags to 26px (#104) --- applications/launchpad_v2/src/components/Tag/styles.ts | 2 +- applications/launchpad_v2/src/components/Text/index.tsx | 1 - .../src/containers/BaseNodeContainer/BaseNode.tsx | 6 +++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/launchpad_v2/src/components/Tag/styles.ts b/applications/launchpad_v2/src/components/Tag/styles.ts index 27e6ca4b8a..c4c75fef9d 100644 --- a/applications/launchpad_v2/src/components/Tag/styles.ts +++ b/applications/launchpad_v2/src/components/Tag/styles.ts @@ -6,7 +6,7 @@ export const TagContainer = styled.div<{ variant?: string }>` justify-content: center; align-items: center; border-radius: 64px; - height: ${({ variant }) => (variant === 'large' ? '30px' : '26px')}; + height: 26px; border: 0; width: fit-content; padding-left: 12px; diff --git a/applications/launchpad_v2/src/components/Text/index.tsx b/applications/launchpad_v2/src/components/Text/index.tsx index 85e65e23a2..187f658de8 100644 --- a/applications/launchpad_v2/src/components/Text/index.tsx +++ b/applications/launchpad_v2/src/components/Text/index.tsx @@ -26,7 +26,6 @@ const Text = ({ }: TextProps) => { const textStyles = { color, - ...style, ...styles.typography[type], ...style, } diff --git a/applications/launchpad_v2/src/containers/BaseNodeContainer/BaseNode.tsx b/applications/launchpad_v2/src/containers/BaseNodeContainer/BaseNode.tsx index 2564b94876..f86a287915 100644 --- a/applications/launchpad_v2/src/containers/BaseNodeContainer/BaseNode.tsx +++ b/applications/launchpad_v2/src/containers/BaseNodeContainer/BaseNode.tsx @@ -47,7 +47,11 @@ const BaseNode = ({ color={running ? theme.inverted.primary : undefined} > {t.baseNode.title} - {running && {t.common.adjectives.running}} + {running && ( + + {t.common.adjectives.running} + + )}