Skip to content

Commit 09d1ba9

Browse files
fixes
1 parent 5efe8c6 commit 09d1ba9

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

packages/ui/src/components/text.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const textVariants = cva('', {
7474
warning: 'text-cn-warning',
7575
merged: 'text-cn-merged',
7676
danger: 'text-cn-danger',
77-
accent: 'text-cn-brand'
77+
brand: 'text-cn-brand'
7878
},
7979
lineClamp: {
8080
default: '',

packages/ui/src/views/repo/pull-request/details/components/conversation/pull-request-panel.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const HeaderTitle = ({ ...props }: HeaderProps) => {
121121

122122
const getStatusTextColor = (): TextProps['color'] => {
123123
if (isDraft) return 'foreground-1'
124-
if (isClosed) return 'accent'
124+
if (isClosed) return 'brand'
125125
if (isMerged) return 'merged'
126126

127127
if (isOpen && (mergeable === false || ruleViolation || isFastForwardNotPossible)) {
@@ -520,6 +520,7 @@ const PullRequestPanel = ({
520520
disableHover
521521
>
522522
<StackedList.Field
523+
className="min-w-fit max-w-fit"
523524
title={
524525
<HeaderTitle
525526
isDraft={isDraft}
@@ -547,11 +548,12 @@ const PullRequestPanel = ({
547548
<>
548549
<StackedList.Field
549550
right
551+
className="grow [&>.cn-stacked-list-field-title]:overflow-visible"
550552
title={
551-
<Layout.Horizontal align="center" justify="center" gap="sm">
552-
{!notBypassable && isMergeable && !isDraft && prPanelData.ruleViolation && (
553+
<Layout.Horizontal align="center" gap="sm" wrap="wrap">
554+
{
553555
<Checkbox
554-
className="flex-1"
556+
className="!w-fit"
555557
id="checkbox-bypass"
556558
showOptionalLabel
557559
checked={!!checkboxBypass}
@@ -563,7 +565,7 @@ const PullRequestPanel = ({
563565
label="Bypass and merge anyway"
564566
truncateLabel={false}
565567
/>
566-
)}
568+
}
567569

568570
{shouldShowMoreActions && (
569571
<MoreActionsTooltip

0 commit comments

Comments
 (0)