From 58f458383668808ffcdf05d14e7a3ef9395fc536 Mon Sep 17 00:00:00 2001 From: Anastasia Ramina <131158394+cxramina@users.noreply.github.com> Date: Mon, 8 Sep 2025 22:23:24 +0200 Subject: [PATCH 01/10] font-weight fix --- .../design-tokens/breakpoint/desktop.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/core-design-system/design-tokens/breakpoint/desktop.json b/packages/core-design-system/design-tokens/breakpoint/desktop.json index 43f813e809..58ecc72371 100644 --- a/packages/core-design-system/design-tokens/breakpoint/desktop.json +++ b/packages/core-design-system/design-tokens/breakpoint/desktop.json @@ -76,7 +76,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.600}", + "fontWeight": "{fontWeight.default.normal.500}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.normal}" @@ -89,7 +89,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.400}", + "fontWeight": "{fontWeight.default.normal.300}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", @@ -101,7 +101,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.500}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", @@ -136,7 +136,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.400}", + "fontWeight": "{fontWeight.default.normal.300}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.none}", "letterSpacing": "{tracking.tight}" @@ -147,7 +147,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.500}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.none}", "letterSpacing": "{tracking.tight}" @@ -265,7 +265,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.400}", + "fontWeight": "{fontWeight.default.normal.300}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", @@ -277,7 +277,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.400}", + "fontWeight": "{fontWeight.default.normal.300}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", From 2b2aefabfa07eed48da51bd0d2ebf1fdd58a235b Mon Sep 17 00:00:00 2001 From: Anastasia Ramina <131158394+cxramina@users.noreply.github.com> Date: Mon, 8 Sep 2025 22:32:59 +0200 Subject: [PATCH 02/10] fix --- .../design-tokens/breakpoint/desktop.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core-design-system/design-tokens/breakpoint/desktop.json b/packages/core-design-system/design-tokens/breakpoint/desktop.json index 58ecc72371..65776a252b 100644 --- a/packages/core-design-system/design-tokens/breakpoint/desktop.json +++ b/packages/core-design-system/design-tokens/breakpoint/desktop.json @@ -76,7 +76,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.500}", + "fontWeight": "{fontWeight.default.normal.600}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.normal}" @@ -89,7 +89,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.300}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", @@ -101,7 +101,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.400}", + "fontWeight": "{fontWeight.default.normal.500}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", From 0c792c01fdca4f19eab80b38b84aca820b4444cf Mon Sep 17 00:00:00 2001 From: Anastasia Ramina <131158394+cxramina@users.noreply.github.com> Date: Mon, 8 Sep 2025 22:48:28 +0200 Subject: [PATCH 03/10] fix --- .../core-design-system/design-tokens/breakpoint/desktop.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core-design-system/design-tokens/breakpoint/desktop.json b/packages/core-design-system/design-tokens/breakpoint/desktop.json index 65776a252b..37887b7c14 100644 --- a/packages/core-design-system/design-tokens/breakpoint/desktop.json +++ b/packages/core-design-system/design-tokens/breakpoint/desktop.json @@ -265,7 +265,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.300}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", @@ -277,7 +277,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.300}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.2}", "lineHeight": "{lineHeight.2.snug}", "letterSpacing": "{tracking.tight}", From e051b4ca96f5258bf64efcee6b9c4a4f5fd01666 Mon Sep 17 00:00:00 2001 From: "cx.ramina" Date: Mon, 8 Sep 2025 23:15:17 +0200 Subject: [PATCH 04/10] added font-mono class, since we use it across pages, but the class itself do not exist --- packages/ui/tailwind-design-system.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/ui/tailwind-design-system.ts b/packages/ui/tailwind-design-system.ts index 82490ea578..d73f4f7421 100644 --- a/packages/ui/tailwind-design-system.ts +++ b/packages/ui/tailwind-design-system.ts @@ -633,6 +633,13 @@ export default { plugin(({ addUtilities }) => { addUtilities(typographyStyles) }), + plugin(({ addUtilities }) => { + addUtilities({ + '.font-mono': { + font: 'var(--cn-body-code)' + } + }) + }), plugin(({ addComponents }) => { addComponents(ComponentStyles) }), From 30a9e3788cb27fd19372b272435c3ae41cf97aa5 Mon Sep 17 00:00:00 2001 From: "cx.ramina" Date: Mon, 8 Sep 2025 23:44:36 +0200 Subject: [PATCH 05/10] swap old mon class to new one --- apps/gitness/src/pages-v2/repo/repo-execution-list.tsx | 2 +- apps/gitness/src/utils/execution-utils.tsx | 2 +- apps/portal/src/components/docs-page/props-table.tsx | 4 ++-- apps/portal/src/content/docs/components/search-input.mdx | 2 +- packages/ui/src/components/commit-copy-actions.tsx | 4 ++-- packages/ui/src/views/execution/console-logs.tsx | 8 ++++---- .../conversation/sections/pull-request-merge-section.tsx | 2 +- packages/ui/tailwind-design-system.ts | 7 ------- 8 files changed, 12 insertions(+), 19 deletions(-) diff --git a/apps/gitness/src/pages-v2/repo/repo-execution-list.tsx b/apps/gitness/src/pages-v2/repo/repo-execution-list.tsx index 5de4ea7e1d..3404608ffc 100644 --- a/apps/gitness/src/pages-v2/repo/repo-execution-list.tsx +++ b/apps/gitness/src/pages-v2/repo/repo-execution-list.tsx @@ -93,7 +93,7 @@ function apiExecutions2Executions(data: ListExecutionsOkResponse): IExecution[] const Branch = ({ children }: { children: React.ReactNode }): React.ReactElement => { return ( -
+
{children}
diff --git a/apps/gitness/src/utils/execution-utils.tsx b/apps/gitness/src/utils/execution-utils.tsx index 80e69c8163..339786bfc9 100644 --- a/apps/gitness/src/utils/execution-utils.tsx +++ b/apps/gitness/src/utils/execution-utils.tsx @@ -4,7 +4,7 @@ import { PipelineExecutionStatus } from '@harnessio/ui/views' const renderBranch = (branch: string): React.ReactElement => { return ( -
+
{branch}
diff --git a/apps/portal/src/components/docs-page/props-table.tsx b/apps/portal/src/components/docs-page/props-table.tsx index 6ae8ead1fd..ac45861079 100644 --- a/apps/portal/src/components/docs-page/props-table.tsx +++ b/apps/portal/src/components/docs-page/props-table.tsx @@ -29,8 +29,8 @@ const PropsTable: FC = ({ props }) => ( {name} {required ? "true" : "false"} - {defaultValue} - {value} + {defaultValue} + {value} ))} diff --git a/apps/portal/src/content/docs/components/search-input.mdx b/apps/portal/src/content/docs/components/search-input.mdx index f0b6ddf654..6543ae269b 100644 --- a/apps/portal/src/content/docs/components/search-input.mdx +++ b/apps/portal/src/content/docs/components/search-input.mdx @@ -23,7 +23,7 @@ return (
Current Search Value:
-

{searchValue || "(empty)"}

+

{searchValue || "(empty)"}

) }`} /> diff --git a/packages/ui/src/components/commit-copy-actions.tsx b/packages/ui/src/components/commit-copy-actions.tsx index 8750f07df8..0ebf08e3d4 100644 --- a/packages/ui/src/components/commit-copy-actions.tsx +++ b/packages/ui/src/components/commit-copy-actions.tsx @@ -43,14 +43,14 @@ export const CommitCopyActions = ({ variant="secondary" noHoverUnderline > - + {sha.substring(0, 6)} ), tabIndex: -1, onKeyDown: handleKeyDown, - className: 'font-mono' + className: 'font-body-code' }, { ...(copyButtonProps as ButtonGroupButtonProps), diff --git a/packages/ui/src/views/execution/console-logs.tsx b/packages/ui/src/views/execution/console-logs.tsx index 669fcc6a20..0c3f81c921 100644 --- a/packages/ui/src/views/execution/console-logs.tsx +++ b/packages/ui/src/views/execution/console-logs.tsx @@ -45,15 +45,15 @@ const ConsoleLogs: FC = ({ logs, query }) => { const logText = useCallback( (log: string) => { if (!query?.length) { - return {log} + return {log} } const match = log.match(new RegExp(query, 'i')) - if (!match) return {log} + if (!match) return {log} const matchIndex = match.index ?? 0 return ( - + {log.slice(0, matchIndex)} {log.slice(matchIndex, matchIndex + query.length)} {log.slice(matchIndex + query.length)} @@ -73,7 +73,7 @@ const ConsoleLogs: FC = ({ logs, query }) => { return (
= item => { justify="between" className="border border-cn-2 rounded-md px-1.5 py-1.5 mt-1 mb-3" > - + {item.code} diff --git a/packages/ui/tailwind-design-system.ts b/packages/ui/tailwind-design-system.ts index d73f4f7421..82490ea578 100644 --- a/packages/ui/tailwind-design-system.ts +++ b/packages/ui/tailwind-design-system.ts @@ -633,13 +633,6 @@ export default { plugin(({ addUtilities }) => { addUtilities(typographyStyles) }), - plugin(({ addUtilities }) => { - addUtilities({ - '.font-mono': { - font: 'var(--cn-body-code)' - } - }) - }), plugin(({ addComponents }) => { addComponents(ComponentStyles) }), From 9d02186195c138aa4c6f7492f2a780321a98169d Mon Sep 17 00:00:00 2001 From: Anastasia Ramina <131158394+cxramina@users.noreply.github.com> Date: Mon, 8 Sep 2025 23:59:09 +0200 Subject: [PATCH 06/10] fix --- .../design-tokens/breakpoint/desktop.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core-design-system/design-tokens/breakpoint/desktop.json b/packages/core-design-system/design-tokens/breakpoint/desktop.json index 37887b7c14..81487ec00f 100644 --- a/packages/core-design-system/design-tokens/breakpoint/desktop.json +++ b/packages/core-design-system/design-tokens/breakpoint/desktop.json @@ -42,7 +42,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.500}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.6}", "lineHeight": "{lineHeight.6.snug}", "letterSpacing": "{tracking.tighter}", @@ -54,7 +54,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.500}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.4}", "lineHeight": "{lineHeight.4.snug}", "letterSpacing": "{tracking.tight}" @@ -65,7 +65,7 @@ "$type": "typography", "$value": { "fontFamily": "{fontFamily.default}", - "fontWeight": "{fontWeight.default.normal.500}", + "fontWeight": "{fontWeight.default.normal.400}", "fontSize": "{fontSize.3}", "lineHeight": "{lineHeight.3.tight}", "letterSpacing": "{tracking.tight}" From 32dce734549831d3f9c7e95c773841690b08e6ee Mon Sep 17 00:00:00 2001 From: Anastasiia Ramina Date: Mon, 8 Sep 2025 22:12:18 +0000 Subject: [PATCH 07/10] Edit packages/ui/src/views/repo/pull-request/details/components/conversation/pull-request-panel.tsx --- .../details/components/conversation/pull-request-panel.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/views/repo/pull-request/details/components/conversation/pull-request-panel.tsx b/packages/ui/src/views/repo/pull-request/details/components/conversation/pull-request-panel.tsx index 4814ae3701..8cfd120801 100644 --- a/packages/ui/src/views/repo/pull-request/details/components/conversation/pull-request-panel.tsx +++ b/packages/ui/src/views/repo/pull-request/details/components/conversation/pull-request-panel.tsx @@ -564,8 +564,8 @@ const PullRequestPanel = ({ const headerRowBgClass = cn({ 'bg-cn-green-surface': prState === PrState.Success, 'bg-cn-2': prState === PrState.Draft, - 'bg-label-background-red': prState === PrState.Error, - 'bg-cn-gray-soft': prState === PrState.Closed, + 'bg-cn-red-surface': prState === PrState.Error, + 'bg-cn-gray-surface': prState === PrState.Closed, 'bg-cn-purple-surface': prState === PrState.Merged }) From 867104500a7ea4ec5d195b3fd1555959ca8cb8fe Mon Sep 17 00:00:00 2001 From: "cx.ramina" Date: Tue, 9 Sep 2025 00:31:35 +0200 Subject: [PATCH 08/10] reverted customization to the table header cell --- .../repo/repo-branch/components/branch-list.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx b/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx index 07fb5801b9..7b05ea4bea 100644 --- a/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx +++ b/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx @@ -44,29 +44,29 @@ export const BranchesList: FC = ({ - {t('views:repos.branch', 'Branch')} + {t('views:repos.branch', 'Branch')} - {t('views:repos.update', 'Updated')} + {t('views:repos.update', 'Updated')} {branches[0]?.checks && ( - {t('views:repos.checkStatus', 'Check status')} + {t('views:repos.checkStatus', 'Check status')} )} - + {t('views:repos.behind', 'Behind')} - {t('views:repos.ahead', 'Ahead')} + {t('views:repos.ahead', 'Ahead')} - {t('views:repos.pullRequest', 'Pull Request')} + {t('views:repos.pullRequest', 'Pull Request')} From db905ce489e7c67418d1579cf9b753466f7b8d8f Mon Sep 17 00:00:00 2001 From: "cx.ramina" Date: Tue, 9 Sep 2025 00:35:47 +0200 Subject: [PATCH 09/10] prettier fix --- .../repo-branch/components/branch-list.tsx | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx b/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx index 7b05ea4bea..ed430635b4 100644 --- a/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx +++ b/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx @@ -43,31 +43,21 @@ export const BranchesList: FC = ({ - - {t('views:repos.branch', 'Branch')} - - - {t('views:repos.update', 'Updated')} - + {t('views:repos.branch', 'Branch')} + {t('views:repos.update', 'Updated')} {branches[0]?.checks && ( - - {t('views:repos.checkStatus', 'Check status')} - + {t('views:repos.checkStatus', 'Check status')} )} - - {t('views:repos.behind', 'Behind')} - + {t('views:repos.behind', 'Behind')} {t('views:repos.ahead', 'Ahead')} - - {t('views:repos.pullRequest', 'Pull Request')} - + {t('views:repos.pullRequest', 'Pull Request')} From d702be1a7d7356860845c2f1103899f3bad5b0ad Mon Sep 17 00:00:00 2001 From: "cx.ramina" Date: Tue, 9 Sep 2025 00:41:47 +0200 Subject: [PATCH 10/10] header cell fix --- .../ui/src/views/repo/repo-branch/components/branch-list.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx b/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx index ed430635b4..c062f6f8dd 100644 --- a/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx +++ b/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx @@ -52,9 +52,9 @@ export const BranchesList: FC = ({ - {t('views:repos.behind', 'Behind')} + {t('views:repos.behind', 'Behind')} - {t('views:repos.ahead', 'Ahead')} + {t('views:repos.ahead', 'Ahead')} {t('views:repos.pullRequest', 'Pull Request')}