diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx index d7dfdc0be..ec8102929 100644 --- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx +++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx @@ -233,11 +233,7 @@ export const PullRequestActionsBox: React.FC = ({ messageTitle = mergeOption.method === MergeStrategy.SQUASH ? `${commit.title} (#${pullReqMetadata?.number})` - : getString('mergeBranchTitle', { - branchName: pullReqMetadata?.source_branch, - repoPath: repoMetadata?.path, - prNum: pullReqMetadata?.number - }) + : `Merge branch ${pullReqMetadata?.source_branch} of ${repoMetadata?.path} (#${pullReqMetadata?.number}})` }) } return { diff --git a/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss b/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss index b22b86d83..a53cf694d 100644 --- a/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss +++ b/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss @@ -176,7 +176,7 @@ line-height: 10px !important; color: var(--fgColor) !important; background-color: var(--bgColor) !important; - padding-left: 8px !important; + padding-left: 4px !important; padding-right: 4px !important; } @@ -188,6 +188,10 @@ padding-right: 4.05rem !important; } +.paddingWithOutReq { + padding-right: 4.55rem !important; +} + .changeContainerPadding { padding-right: 3.5rem !important; } @@ -200,7 +204,7 @@ .gridContainer { display: grid !important; - grid-template-columns: 1fr 1fr !important; /* Two equal columns */ + grid-template-columns: 1fr 0.75fr !important; position: relative !important; } @@ -227,6 +231,7 @@ content: ''; display: block !important; height: 0 !important; /* Ensures it doesn't take up additional vertical space */ + visibility: hidden !important; /* Ensures it doesn't appear visually */ background-color: transparent !important; border: none !important; } diff --git a/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss.d.ts b/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss.d.ts index 6253e27ad..1049e751a 100644 --- a/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss.d.ts +++ b/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss.d.ts @@ -34,6 +34,7 @@ export declare const iconStatus: string export declare const mainContainer: string export declare const mergedContainer: string export declare const paddingContainer: string +export declare const paddingWithOutReq: string export declare const pendingIcon: string export declare const redIcon: string export declare const required: string diff --git a/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChecksSection.tsx b/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChecksSection.tsx index 6449c5a94..fe59fb46c 100644 --- a/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChecksSection.tsx +++ b/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChecksSection.tsx @@ -283,7 +283,7 @@ const ChecksSection = (props: ChecksSectionProps) => { /> - + {check.check.status !== CheckStatus.PENDING && (