Skip to content
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

Fixed a few issues from MFE Bugbash India sheet #690

Merged
merged 4 commits into from
Jan 23, 2025
Merged

Fixed a few issues from MFE Bugbash India sheet #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56b871b
Fixed pull request compare route in branch info bar
vivek-harness Jan 16, 2025
3ce5418
Fixed view all branches button click issue in branch selector
vivek-harness Jan 16, 2025
848b701
Fixed open PR count font color in light theme
vivek-harness Jan 16, 2025
7947a9c
Changed diff viewer colors to work with light theme
vivek-harness Jan 16, 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
26 changes: 13 additions & 13 deletions packages/ui/src/shared-style-variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,23 +315,23 @@
--canary-ai-button-stop-2: var(--canary-ai-pink);
--canary-ai-button-stop-3: var(--canary-ai-purple);
--canary-ai-button-stop-4: var(--canary-ai-cyan);
--diff-grey: hsl(0 0% 33%);
--diff-add-content--: hsl(156 28% 10%);
--diff-del-content--: hsl(356 28% 11%);
--diff-add-lineNumber--: hsl(153 40% 14%);
--diff-del-lineNumber--: hsl(358 39% 17%);
--diff-grey: hsl(0 0% 20%);
--diff-add-content--: hsl(156 100% 95%);
--diff-del-content--: hsl(356 100% 95%);
--diff-add-lineNumber--: hsl(153 100% 90%);
--diff-del-lineNumber--: hsl(358 100% 90%);
--diff-plain-content--: var(--canary-background);
--diff-expand-content--: var(--canary-background);
--diff-plain-lineNumber--: var(--canary-background);
--diff-plain-lineNumber-color--: hsl(0 0% 100%);
--diff-hunk-content--: hsl(218 26% 12%);
--diff-hunk-lineNumber--: hsl(218 26% 12%);
--diff-add-content-highlight--: hsl(152 37% 24%);
--diff-del-content-highlight--: hsl(0 38% 26%);
--diff-add-widget--: hsl(216 80% 65%);
--diff-add-widget-color--: hsl(0 0% 100%);
--diff-plain-lineNumber-color--: hsl(0 0% 0%);
--diff-hunk-content--: hsl(218 26% 95%);
--diff-hunk-lineNumber--: hsl(218 26% 95%);
--diff-add-content-highlight--: hsl(152 37% 90%);
--diff-del-content-highlight--: hsl(0 38% 90%);
--diff-add-widget--: hsl(216 80% 95%);
--diff-add-widget-color--: hsl(0 0% 0%);
--diff-empty-content--: var(--canary-background);
--diff-hunk-content-color--: hsl(0 0% 100%);
--diff-hunk-content-color--: hsl(0 0% 0%);
/* New colors design variables */
/* Text */
--canary-foreground-01: var(--canary-harness-grey-900);
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/views/repo/components/branch-info-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ export const BranchInfoBar: FC<BranchInfoBarProps> = ({
This branch is{' '}
{hasAhead && (
<>
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pull-requests/compare/`}>
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pulls/compare/`}>
<span className="text-foreground-accent">{ahead} commits ahead of</span>
</StyledLink>
{hasBehind && ', '}
</>
)}
{hasBehind && (
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pull-requests/compare/`}>
<StyledLink to={`${spaceId ? `/${spaceId}` : ''}/repos/${repoId}/pulls/compare/`}>
<span className="text-foreground-accent">{behind} commits behind</span>
</StyledLink>
)}
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/views/repo/components/branch-selector/branch-selector-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ export const BranchSelectorDropdown: FC<BranchSelectorDropdownProps> = ({
</div>

<DropdownMenu.Item className="p-0" asChild>
<div className="mt-1 border-t border-borders-1 px-3 py-2">
<Link to={viewAllUrl}>
<Link to={viewAllUrl}>
<div className="w-full border-t border-borders-1 px-3 py-2">
<span className="text-14 font-medium leading-none transition-colors duration-200 hover:text-foreground-1">
{t('views:repos.viewAll', `View all ${activeTab}`, {
type:
Expand All @@ -175,8 +175,8 @@ export const BranchSelectorDropdown: FC<BranchSelectorDropdownProps> = ({
: t('views:repos.tagsLowercase', 'tags')
})}
</span>
</Link>
</div>
</div>
</Link>
</DropdownMenu.Item>
</div>
</DropdownMenu.Content>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/views/repo/pull-request/components/pull-request-list-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const PullRequestListHeader: FC<PullRequestListHeaderProps> = ({
className={cn(
'text-14 leading-tight',
headerFilter === PULL_REQUEST_LIST_HEADER_FILTER_STATES.OPEN
? 'text-white font-medium'
? 'text-foreground-4 font-medium'
: 'text-foreground-4'
)}
>
Expand All @@ -53,7 +53,7 @@ export const PullRequestListHeader: FC<PullRequestListHeaderProps> = ({
className={cn(
'text-14 leading-tight',
headerFilter === PULL_REQUEST_LIST_HEADER_FILTER_STATES.CLOSED
? 'text-white font-medium'
? 'text-foreground-4 font-medium'
: 'text-foreground-4'
)}
>
Expand Down