Skip to content

Fixes #5622 #5624

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
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fixes #5622 #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25093fc
added foreground colors to the package.json
pouyakary Jan 16, 2024
923c07e
added foreground colors to status badges of pr requests
pouyakary Jan 16, 2024
1428cd8
fixed the colors
pouyakary Jan 16, 2024
d90a5c2
Applied the changed requested by @alexr00
pouyakary Jan 18, 2024
8dbd6c2
Fix light vs dark, fix var color references
alexr00 Jan 19, 2024
94aaa22
Revert "Fix light vs dark, fix var color references"
alexr00 Jan 19, 2024
decdb2d
Fix merge commit mistake
alexr00 Jan 19, 2024
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
40 changes: 40 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2667,6 +2667,16 @@
},
"description": "The color used for indicating that a pull request is merged."
},
{
"id": "pullRequests.statusMergedForeground",
"defaults": {
"dark": "pullRequests.statusOpenForeground",
"light": "pullRequests.statusOpenForeground",
"highContrast": "editor.foreground",
"highContrastLight": "editor.foreground"
},
"description": "The foreground color used for the status badge indicating that a pull request is merged."
},
{
"id": "pullRequests.draft",
"defaults": {
Expand All @@ -2677,6 +2687,16 @@
},
"description": "The color used for indicating that a pull request is a draft."
},
{
"id": "pullRequests.statusDraftForeground",
"defaults": {
"dark": "pullRequests.statusOpenForeground",
"light": "pullRequests.statusOpenForeground",
"highContrast": "editor.foreground",
"highContrastLight": "editor.foreground"
},
"description": "The foreground color used for the status badge indicating that a pull request is draft."
},
{
"id": "pullRequests.open",
"defaults": {
Expand All @@ -2687,6 +2707,16 @@
},
"description": "The color used for indicating that a pull request is open."
},
{
"id": "pullRequests.statusOpenForeground",
"defaults": {
"dark": "#ffffff",
"light": "#000000",
"highContrast": "editor.foreground",
"highContrastLight": "editor.foreground"
},
"description": "The foreground color used for the status badge indicating that a pull request is open."
},
{
"id": "pullRequests.closed",
"defaults": {
Expand All @@ -2697,6 +2727,16 @@
},
"description": "The color used for indicating that a pull request is closed."
},
{
"id": "pullRequests.statusClosedForeground",
"defaults": {
"dark": "pullRequests.statusOpenForeground",
"light": "pullRequests.statusOpenForeground",
"highContrast": "editor.foreground",
"highContrastLight": "editor.foreground"
},
"description": "The foreground color used for the status badge indicating that a pull request is closed."
},
{
"id": "pullRequests.notification",
"defaults": {
Expand Down
5 changes: 4 additions & 1 deletion webviews/editorWebview/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ body button .icon {
#status {
box-sizing: border-box;
line-height: 18px;
color: var(--vscode-button-foreground);
border-radius: 18px;
padding: 4px 12px;
margin-right: 10px;
Expand All @@ -488,18 +487,22 @@ body button .icon {

.status-badge-merged {
background-color: var(--vscode-pullRequests-merged);
color: var(--vscode-pullRequests-statusMergedForeground);
}

.status-badge-open {
background-color: var(--vscode-pullRequests-open);
color: var(--vscode-pullRequests-statusOpenForeground);
}

.status-badge-closed {
background-color: var(--vscode-pullRequests-closed);
color: var(--vscode-pullRequests-statusClosedForeground);
}

.status-badge-draft {
background-color: var(--vscode-pullRequests-draft);
color: var(--vscode-pullRequests-statusDraftForeground);
}

.section {
Expand Down