Skip to content

Commit e7c21cd

Browse files
Fixed a few issues from MFE Bugbash India sheet (harness#690)
* Fixed pull request compare route in branch info bar * Fixed view all branches button click issue in branch selector * Fixed open PR count font color in light theme * Changed diff viewer colors to work with light theme
1 parent 4fe24a6 commit e7c21cd

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

packages/ui/src/shared-style-variables.css

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -315,23 +315,23 @@
315315
--canary-ai-button-stop-2: var(--canary-ai-pink);
316316
--canary-ai-button-stop-3: var(--canary-ai-purple);
317317
--canary-ai-button-stop-4: var(--canary-ai-cyan);
318-
--diff-grey: hsl(0 0% 33%);
319-
--diff-add-content--: hsl(156 28% 10%);
320-
--diff-del-content--: hsl(356 28% 11%);
321-
--diff-add-lineNumber--: hsl(153 40% 14%);
322-
--diff-del-lineNumber--: hsl(358 39% 17%);
318+
--diff-grey: hsl(0 0% 20%);
319+
--diff-add-content--: hsl(156 100% 95%);
320+
--diff-del-content--: hsl(356 100% 95%);
321+
--diff-add-lineNumber--: hsl(153 100% 90%);
322+
--diff-del-lineNumber--: hsl(358 100% 90%);
323323
--diff-plain-content--: var(--canary-background);
324324
--diff-expand-content--: var(--canary-background);
325325
--diff-plain-lineNumber--: var(--canary-background);
326-
--diff-plain-lineNumber-color--: hsl(0 0% 100%);
327-
--diff-hunk-content--: hsl(218 26% 12%);
328-
--diff-hunk-lineNumber--: hsl(218 26% 12%);
329-
--diff-add-content-highlight--: hsl(152 37% 24%);
330-
--diff-del-content-highlight--: hsl(0 38% 26%);
331-
--diff-add-widget--: hsl(216 80% 65%);
332-
--diff-add-widget-color--: hsl(0 0% 100%);
326+
--diff-plain-lineNumber-color--: hsl(0 0% 0%);
327+
--diff-hunk-content--: hsl(218 26% 95%);
328+
--diff-hunk-lineNumber--: hsl(218 26% 95%);
329+
--diff-add-content-highlight--: hsl(152 37% 90%);
330+
--diff-del-content-highlight--: hsl(0 38% 90%);
331+
--diff-add-widget--: hsl(216 80% 95%);
332+
--diff-add-widget-color--: hsl(0 0% 0%);
333333
--diff-empty-content--: var(--canary-background);
334-
--diff-hunk-content-color--: hsl(0 0% 100%);
334+
--diff-hunk-content-color--: hsl(0 0% 0%);
335335
/* New colors design variables */
336336
/* Text */
337337
--canary-foreground-01: var(--canary-harness-grey-900);

packages/ui/src/views/repo/components/branch-info-bar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ export const BranchInfoBar: FC<BranchInfoBarProps> = ({
3030
This branch is{' '}
3131
{hasAhead && (
3232
<>
33-
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pull-requests/compare/`}>
33+
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pulls/compare/`}>
3434
<span className="text-foreground-accent">{ahead} commits ahead of</span>
3535
</StyledLink>
3636
{hasBehind && ', '}
3737
</>
3838
)}
3939
{hasBehind && (
40-
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pull-requests/compare/`}>
40+
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pulls/compare/`}>
4141
<span className="text-foreground-accent">{behind} commits behind</span>
4242
</StyledLink>
4343
)}

packages/ui/src/views/repo/components/branch-selector/branch-selector-dropdown.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ export const BranchSelectorDropdown: FC<BranchSelectorDropdownProps> = ({
165165
</div>
166166

167167
<DropdownMenu.Item className="p-0" asChild>
168-
<div className="mt-1 border-t border-borders-1 px-3 py-2">
169-
<Link to={viewAllUrl}>
168+
<Link to={viewAllUrl}>
169+
<div className="w-full border-t border-borders-1 px-3 py-2">
170170
<span className="text-14 font-medium leading-none transition-colors duration-200 hover:text-foreground-1">
171171
{t('views:repos.viewAll', `View all ${activeTab}`, {
172172
type:
@@ -175,8 +175,8 @@ export const BranchSelectorDropdown: FC<BranchSelectorDropdownProps> = ({
175175
: t('views:repos.tagsLowercase', 'tags')
176176
})}
177177
</span>
178-
</Link>
179-
</div>
178+
</div>
179+
</Link>
180180
</DropdownMenu.Item>
181181
</div>
182182
</DropdownMenu.Content>

packages/ui/src/views/repo/pull-request/components/pull-request-list-header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const PullRequestListHeader: FC<PullRequestListHeaderProps> = ({
3434
className={cn(
3535
'text-14 leading-tight',
3636
headerFilter === PULL_REQUEST_LIST_HEADER_FILTER_STATES.OPEN
37-
? 'text-white font-medium'
37+
? 'text-foreground-4 font-medium'
3838
: 'text-foreground-4'
3939
)}
4040
>
@@ -53,7 +53,7 @@ export const PullRequestListHeader: FC<PullRequestListHeaderProps> = ({
5353
className={cn(
5454
'text-14 leading-tight',
5555
headerFilter === PULL_REQUEST_LIST_HEADER_FILTER_STATES.CLOSED
56-
? 'text-white font-medium'
56+
? 'text-foreground-4 font-medium'
5757
: 'text-foreground-4'
5858
)}
5959
>

0 commit comments

Comments
 (0)