Skip to content

Add differentiating badge icon for issues and PRs #483

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

Open
bipplane wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add differentiating badge icon for issues and PRs #483

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2eeb988
Add differentiating background colour (purple) for issue-card and car…
bipplane Jun 19, 2025
7e7e9d0
Merge branch 'main' into issue-pr-coloured-cards
bipplane Jun 30, 2025
6c66ad6
Rename card to pr-card for consistency
bipplane Jun 30, 2025
f205628
Add base classes for card and row count
bipplane Jul 1, 2025
fe0f620
Add type-related badge to replace colour differentiation
bipplane Jul 3, 2025
584ecd4
Revert header background colour back to original
bipplane Jul 3, 2025
4609c6c
Merge branch 'main' into issue-pr-coloured-cards
bipplane Jul 12, 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
15 changes: 14 additions & 1 deletion src/app/issues-viewer/card-view/card-view.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ div.column-header .mat-card-header {
margin: 6px 0;
}

.row-count {
.pr-row-count {
background-color: rgb(222, 222, 222);
border-radius: 3px;
cursor: default;
Expand All @@ -144,6 +144,19 @@ div.column-header .mat-card-header {
margin-top: 3px;
}

.issue-row-count {
background-color: #f2e9ff;
border-radius: 3px;
cursor: default;
padding: 6px 8px 3px 8px;
color: rgb(0, 0, 0);
font-weight: 410;
display: inline-flex;
font-size: 14px;
flex-shrink: 0;
margin-top: 3px;
}

.assignee-container {
width: 100%;
text-align: left;
Expand Down
8 changes: 4 additions & 4 deletions src/app/issues-viewer/card-view/card-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
<div class="assignee-name">
{{ assignee.login }}
</div>
<div class="row-count count-margins" [matTooltip]="getIssueTooltip()" matTooltipPosition="above">
<div class="issue-row-count count-margins" [matTooltip]="getIssueTooltip()" matTooltipPosition="above">
<span class="octicon count-margins" octicon="issue-opened"></span>
<span class="">{{ this.issues.issueCount }}</span>
</div>
<div class="row-count" [matTooltip]="getPrTooltip()" matTooltipPosition="above">
<div class="pr-row-count" [matTooltip]="getPrTooltip()" matTooltipPosition="above">
<span class="octicon count-margins" octicon="git-pull-request"></span>
<span>{{ this.issues.prCount }}</span>
</div>
Expand All @@ -69,11 +69,11 @@
<div>
{{ milestone.title }}
</div>
<div class="row-count count-margins" [matTooltip]="getIssueTooltip()" matTooltipPosition="above">
<div class="issue-row-count count-margins" [matTooltip]="getIssueTooltip()" matTooltipPosition="above">
<span class="octicon count-margins" octicon="issue-opened"></span>
<span class="">{{ this.issues.issueCount }}</span>
</div>
<div class="row-count" [matTooltip]="getPrTooltip()" matTooltipPosition="above">
<div class="pr-row-count" [matTooltip]="getPrTooltip()" matTooltipPosition="above">
<span class="octicon count-margins" octicon="git-pull-request"></span>
<span>{{ this.issues.prCount }}</span>
</div>
Expand Down
7 changes: 6 additions & 1 deletion src/app/shared/issue-pr-card/issue-pr-card.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
.card {
.pr-card {
margin: 8px 0px 8px 0px;
background-color: transparent;
}

.issue-card {
margin: 8px 0px 8px 0px;
background-color: #f2e9ff;
}

.mat-card {
padding: 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/issue-pr-card/issue-pr-card.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<mat-card class="card" [ngClass]="getIssueOpenOrCloseColorCSSClass()">
<mat-card class="pr-card" [class.issue-card]="isIssue()" [ngClass]="getIssueOpenOrCloseColorCSSClass()">
<a class="no-underline link-grey-dark">
<span [matTooltip]="this.issue.updated_at">
<app-issue-pr-card-header [issue]="issue" (click)="viewIssueInBrowser($event)"></app-issue-pr-card-header>
Expand Down
4 changes: 4 additions & 0 deletions src/app/shared/issue-pr-card/issue-pr-card.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,8 @@ export class IssuePrCardComponent {
isMergedWithoutReview(issue: Issue): boolean {
return issue.issueOrPr === 'PullRequest' && issue.state === 'MERGED' && (!issue.reviews || issue.reviews.length === 0);
}

isIssue(): boolean {
return this.issue.issueOrPr === 'Issue';
}
}