Skip to content

font-weight fix #2132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

font-weight fix #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
58f4583
font-weight fix
cxramina Sep 8, 2025
2b2aefa
fix
cxramina Sep 8, 2025
0c792c0
fix
cxramina Sep 8, 2025
e051b4c
added font-mono class, since we use it across pages, but the class it…
cxramina Sep 8, 2025
30a9e37
swap old mon class to new one
cxramina Sep 8, 2025
9d02186
fix
cxramina Sep 8, 2025
32dce73
Edit packages/ui/src/views/repo/pull-request/details/components/conve…
cxramina Sep 8, 2025
8671045
reverted customization to the table header cell
cxramina Sep 8, 2025
db905ce
prettier fix
cxramina Sep 8, 2025
d702be1
header cell fix
cxramina Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/gitness/src/pages-v2/repo/repo-execution-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function apiExecutions2Executions(data: ListExecutionsOkResponse): IExecution[]

const Branch = ({ children }: { children: React.ReactNode }): React.ReactElement => {
return (
<div className="flex items-center gap-1 rounded-md bg-cn-1/10 px-1.5 font-mono">
<div className="flex items-center gap-1 rounded-md bg-cn-1/10 px-1.5 font-body-code">
<IconV2 name="git-branch" size="2xs" className="text-cn-3" />
{children}
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/gitness/src/utils/execution-utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PipelineExecutionStatus } from '@harnessio/ui/views'

const renderBranch = (branch: string): React.ReactElement => {
return (
<div className="flex items-center gap-1 rounded-md bg-cn-1/10 px-1.5 font-mono">
<div className="flex items-center gap-1 rounded-md bg-cn-1/10 px-1.5 font-body-code">
<IconV2 name="git-branch" size="2xs" className="text-cn-3" />
{branch}
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/portal/src/components/docs-page/props-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ const PropsTable: FC<PropsTableProps> = ({ props }) => (
<Table.Row key={name}>
<Table.Cell title={description}>{name}</Table.Cell>
<Table.Cell>{required ? "true" : "false"}</Table.Cell>
<Table.Cell className="font-mono">{defaultValue}</Table.Cell>
<Table.Cell className="font-mono">{value}</Table.Cell>
<Table.Cell className="font-body-code">{defaultValue}</Table.Cell>
<Table.Cell className="font-body-code">{value}</Table.Cell>
</Table.Row>
))}
</Table.Body>
Expand Down
2 changes: 1 addition & 1 deletion apps/portal/src/content/docs/components/search-input.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ return (
<div className="text-sm font-medium underline underline-offset-2">
Current Search Value:
</div>
<p className="mt-1 font-mono text-sm">{searchValue || "(empty)"}</p>
<p className="mt-1 font-body-code text-sm">{searchValue || "(empty)"}</p>
</div>
</div>
) }`} />
Expand Down
10 changes: 5 additions & 5 deletions packages/core-design-system/design-tokens/breakpoint/desktop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand All @@ -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}"
Expand All @@ -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}"
Expand Down Expand Up @@ -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}"
Expand All @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/commit-copy-actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ export const CommitCopyActions = ({
variant="secondary"
noHoverUnderline
>
<Text className="font-mono" color="inherit">
<Text className="font-body-code" color="inherit">
{sha.substring(0, 6)}
</Text>
</Link>
),
tabIndex: -1,
onKeyDown: handleKeyDown,
className: 'font-mono'
className: 'font-body-code'
},
{
...(copyButtonProps as ButtonGroupButtonProps),
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/views/execution/console-logs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ const ConsoleLogs: FC<ConsoleLogsProps> = ({ logs, query }) => {
const logText = useCallback(
(log: string) => {
if (!query?.length) {
return <span className="ml-2 flex gap-1 font-mono text-sm font-normal">{log}</span>
return <span className="ml-2 flex gap-1 font-body-code text-sm font-normal">{log}</span>
}

const match = log.match(new RegExp(query, 'i'))
if (!match) return <span className="ml-2 flex gap-1 font-mono text-sm font-normal">{log}</span>
if (!match) return <span className="ml-2 flex gap-1 font-body-code text-sm font-normal">{log}</span>

const matchIndex = match.index ?? 0
return (
<span className="flex gap-1 font-mono text-sm font-normal">
<span className="flex gap-1 font-body-code text-sm font-normal">
{log.slice(0, matchIndex)}
<mark>{log.slice(matchIndex, matchIndex + query.length)}</mark>
{log.slice(matchIndex + query.length)}
Expand All @@ -73,7 +73,7 @@ const ConsoleLogs: FC<ConsoleLogsProps> = ({ logs, query }) => {
return (
<div
key={index}
className={cn('text-2 flex w-full items-center pl-5 font-mono leading-normal', {
className={cn('text-2 flex w-full items-center pl-5 font-body-code leading-normal', {
'bg-logs-background-6': type === LivelogLineType.WARNING,
'bg-logs-background-7': type === LivelogLineType.ERROR,
'pt-1.5': index !== 0
Expand Down
4 changes: 2 additions & 2 deletions ...ges/ui/src/views/repo/pull-request/details/components/conversation/pull-request-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
})

Expand Down
2 changes: 1 addition & 1 deletion ...repo/pull-request/details/components/conversation/sections/pull-request-merge-section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const StepInfo: FC<StepInfoProps> = item => {
justify="between"
className="border border-cn-2 rounded-md px-1.5 py-1.5 mt-1 mb-3"
>
<Text variant="body-normal" className="font-mono">
<Text variant="body-normal" className="font-body-code">
{item.code}
</Text>
<CopyButton name={item.code} size="xs" />
Expand Down
22 changes: 6 additions & 16 deletions packages/ui/src/views/repo/repo-branch/components/branch-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,21 @@ export const BranchesList: FC<BranchListPageProps> = ({
<Table.Root>
<Table.Header>
<Table.Row>
<Table.Head className="w-[33%]">
<Text variant="caption-strong">{t('views:repos.branch', 'Branch')}</Text>
</Table.Head>
<Table.Head className="w-[15%]">
<Text variant="caption-strong">{t('views:repos.update', 'Updated')}</Text>
</Table.Head>
<Table.Head className="w-[33%]">{t('views:repos.branch', 'Branch')}</Table.Head>
<Table.Head className="w-[15%]">{t('views:repos.update', 'Updated')}</Table.Head>

{branches[0]?.checks && (
<Table.Head className="w-[15%]">
<Text variant="caption-strong">{t('views:repos.checkStatus', 'Check status')}</Text>
</Table.Head>
<Table.Head className="w-[15%]">{t('views:repos.checkStatus', 'Check status')}</Table.Head>
)}

<Table.Head className="w-[15%]" contentClassName="w-full">
<Layout.Grid flow="column" columns="1fr auto 1fr" align="center" justify="center" gapX="2xs">
<Text variant="caption-strong" align="right">
{t('views:repos.behind', 'Behind')}
</Text>
<span className="text-right">{t('views:repos.behind', 'Behind')}</span>
<Separator orientation="vertical" />
<Text variant="caption-strong">{t('views:repos.ahead', 'Ahead')}</Text>
<span>{t('views:repos.ahead', 'Ahead')}</span>
</Layout.Grid>
</Table.Head>
<Table.Head className="w-[15%] whitespace-nowrap">
<Text variant="caption-strong">{t('views:repos.pullRequest', 'Pull Request')}</Text>
</Table.Head>
<Table.Head className="w-[15%] whitespace-nowrap">{t('views:repos.pullRequest', 'Pull Request')}</Table.Head>
<Table.Head className="w-[68px]" />
</Table.Row>
</Table.Header>
Expand Down