Skip to content

Commit 6f96960

Browse files
committed
Updates type badge and hover colors
1 parent ec267d3 commit 6f96960

File tree

5 files changed

+42
-21
lines changed

5 files changed

+42
-21
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14708,7 +14708,7 @@
1470814708
},
1470914709
"dependencies": {
1471014710
"@gitkraken/gitkraken-components": "10.1.9",
14711-
"@gitkraken/shared-web-components": "^0.1.1-rc.3",
14711+
"@gitkraken/shared-web-components": "^0.1.1-rc.4",
1471214712
"@microsoft/fast-element": "1.12.0",
1471314713
"@microsoft/fast-react-wrapper": "0.3.18",
1471414714
"@octokit/core": "4.2.4",

src/webviews/apps/plus/focus/components/gk-issue-row.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ export class GkIssueRow extends LitElement {
4242
a:hover {
4343
text-decoration: underline;
4444
}
45+
a:focus {
46+
outline: 1px solid var(--vscode-focusBorder);
47+
outline-offset: -1px;
48+
}
4549
4650
.actions {
4751
}
@@ -60,10 +64,6 @@ export class GkIssueRow extends LitElement {
6064
text-decoration: none;
6165
cursor: pointer;
6266
}
63-
.actions a:focus {
64-
outline: 1px solid var(--vscode-focusBorder);
65-
outline-offset: -1px;
66-
}
6767
.actions a:hover {
6868
background-color: var(--vscode-toolbar-hoverBackground);
6969
}
@@ -74,6 +74,14 @@ export class GkIssueRow extends LitElement {
7474
.actions a code-icon {
7575
font-size: 1.6rem;
7676
}
77+
78+
.deemphasize {
79+
opacity: 0.5;
80+
}
81+
82+
.title {
83+
font-size: 1.4rem;
84+
}
7785
`,
7886
];
7987

@@ -118,15 +126,13 @@ export class GkIssueRow extends LitElement {
118126
<gk-focus-row>
119127
<span slot="key"></span>
120128
<gk-focus-item>
121-
<span slot="type"
122-
><code-icon icon="${this.issue.closed === true ? 'pass' : 'issues'}"></code-icon
123-
></span>
124129
<p>
125-
<strong>${this.issue.title} <a href="${this.issue.url}">#${this.issue.id}</a></strong>
130+
<span class="title">${this.issue.title} <a href="${this.issue.url}">#${this.issue.id}</a></span>
126131
<!-- &nbsp;
127132
<gk-badge>pending suggestions</gk-badge> -->
128133
</p>
129134
<p>
135+
<gk-badge variant="outline" class="deemphasize">Issue</gk-badge>
130136
<gk-tooltip
131137
><gk-tag variant="ghost" slot="trigger">
132138
<span slot="prefix"><code-icon icon="comment-discussion"></code-icon></span>

src/webviews/apps/plus/focus/components/gk-pull-request-row.ts

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ export class GkPullRequestRow extends LitElement {
4343
a:hover {
4444
text-decoration: underline;
4545
}
46+
a:focus {
47+
outline: 1px solid var(--vscode-focusBorder);
48+
outline-offset: -1px;
49+
}
4650
4751
.actions gk-tooltip {
4852
display: inline-block;
@@ -62,10 +66,6 @@ export class GkPullRequestRow extends LitElement {
6266
text-decoration: none;
6367
cursor: pointer;
6468
}
65-
.actions a:focus {
66-
outline: 1px solid var(--vscode-focusBorder);
67-
outline-offset: -1px;
68-
}
6969
.actions a:hover {
7070
background-color: var(--vscode-toolbar-hoverBackground);
7171
}
@@ -93,6 +93,19 @@ export class GkPullRequestRow extends LitElement {
9393
.indicator-neutral {
9494
color: var(--color-alert-neutralBorder);
9595
}
96+
97+
.deemphasize {
98+
opacity: 0.5;
99+
}
100+
101+
.title {
102+
font-size: 1.4rem;
103+
}
104+
105+
.add-delete {
106+
margin-left: 0.4rem;
107+
margin-right: 0.2rem;
108+
}
96109
`,
97110
];
98111

@@ -197,17 +210,17 @@ export class GkPullRequestRow extends LitElement {
197210
)}
198211
</span>
199212
<gk-focus-item>
200-
<span slot="type"><code-icon icon="git-pull-request"></code-icon></span>
201213
<p>
202-
<strong
214+
<span class="title"
203215
>${this.pullRequest.title}
204-
<a href="${this.pullRequest.url}">#${this.pullRequest.id}</a></strong
216+
<a href="${this.pullRequest.url}">#${this.pullRequest.id}</a></span
205217
>
206218
<!-- &nbsp;
207219
<gk-badge>pending suggestions</gk-badge> -->
208220
</p>
209221
<p>
210-
<gk-additions-deletions>
222+
<gk-badge variant="outline" class="deemphasize">PR</gk-badge>
223+
<gk-additions-deletions class="add-delete">
211224
<span slot="additions">${this.pullRequest.additions}</span>
212225
<span slot="deletions">${this.pullRequest.deletions}</span>
213226
</gk-additions-deletions>

src/webviews/apps/plus/focus/focus.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ body {
3737
--gk-badge-filled-background-color: var(--vscode-badge-background);
3838
--gk-badge-filled-color: var(--vscode-badge-foreground);
3939
--gk-tooltip-padding: 0.4rem 0.8rem;
40+
--gk-focus-background-color-hover: var(--background-05);
41+
--gk-divider-color: var(--background-05);
4042
}
4143

4244
.vscode-high-contrast,

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@
235235
react-dom "16.8.4"
236236
react-dragula "1.1.17"
237237

238-
"@gitkraken/shared-web-components@^0.1.1-rc.3":
239-
version "0.1.1-rc.3"
240-
resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.3.tgz#ad23607c356707aba509b6488dcd1d4ec3ee8cd9"
241-
integrity sha512-mjhyyMR+eYDfp8RR4v+ecyoRV2vx9jV/gEMfrDe/Mf1PTqUVYPCEyAEx/YD6ogNhZlCdQ/on42Y2NaLy3kQHKg==
238+
"@gitkraken/shared-web-components@^0.1.1-rc.4":
239+
version "0.1.1-rc.4"
240+
resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.4.tgz#eaccecad7b7079ef276e3b9e8e61b2ce5d53d3d4"
241+
integrity sha512-BsJa5UDPiRyydC/yv8blXBIMMRVH3rFZJj4CgrdiVn+T5IeiodIlPSnvJ5rYYQvywLD/TsCwA9+hkdfk5sdvCA==
242242
dependencies:
243243
"@floating-ui/dom" "^1.4.2"
244244
typescript "^4.9.5"

0 commit comments

Comments
 (0)