Skip to content

Commit 4e67eca

Browse files
Copilotalexr00
andcommitted
Use code styling for base branch text and secondary button styling
Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>
1 parent e8ecac6 commit 4e67eca

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

webviews/components/header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,10 @@ function Subtitle({ state, stateReason, isDraft, isIssue, author, base, head, co
279279
<button
280280
title="Change base branch"
281281
onClick={changeBaseBranch}
282-
className="branch-tag branch-tag-button"
282+
className="branch-tag-button"
283283
aria-label="Change base branch"
284284
>
285-
{base}
285+
<code className="branch-tag">{base}</code>
286286
</button>
287287
) : (
288288
<code className="branch-tag">{base}</code>

webviews/editorWebview/index.css

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -542,20 +542,28 @@ body button .icon {
542542
}
543543

544544
.branch-tag-button {
545+
background-color: var(--vscode-button-secondaryBackground);
546+
color: var(--vscode-button-secondaryForeground);
545547
border: 1px solid transparent;
548+
border-radius: 4px;
546549
cursor: pointer;
550+
padding: 0;
551+
margin-top: 3px;
547552
font-family: inherit;
548553
font-size: inherit;
549554
}
550555

551-
.branch-tag-button:hover {
552-
background: var(--vscode-button-hoverBackground);
553-
color: var(--vscode-button-foreground);
554-
border-color: var(--vscode-button-border);
556+
.branch-tag-button:hover:enabled {
557+
background-color: var(--vscode-button-secondaryHoverBackground);
555558
}
556559

557560
.branch-tag-button:active {
558-
background: var(--vscode-button-background);
561+
background-color: var(--vscode-button-secondaryHoverBackground);
562+
}
563+
564+
.branch-tag-button .branch-tag {
565+
background: transparent;
566+
margin-top: 0;
559567
}
560568

561569
.merge-branches .icon-button {

0 commit comments

Comments
 (0)