Skip to content

Commit 8cab03b

Browse files
committed
Updates graph preview banner content
1 parent 4950027 commit 8cab03b

File tree

6 files changed

+61
-17
lines changed

6 files changed

+61
-17
lines changed

images/icons/clock.svg

Lines changed: 1 addition & 0 deletions
Loading

images/icons/template/mapping.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@
2828
"expand": 61721,
2929
"list-auto": 61722,
3030
"arrow-up-force": 61723,
31-
"pinned-filled": 61724
31+
"pinned-filled": 61724,
32+
"clock": 61725
3233
}

package.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6394,6 +6394,13 @@
63946394
"fontPath": "dist/glicons.woff2",
63956395
"fontCharacter": "\\f11c"
63966396
}
6397+
},
6398+
"gitlens-clock": {
6399+
"description": "clock icon",
6400+
"default": {
6401+
"fontPath": "dist/glicons.woff2",
6402+
"fontCharacter": "\\f11d"
6403+
}
63976404
}
63986405
},
63996406
"menus": {

src/webviews/apps/plus/graph/GraphWrapper.tsx

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,33 @@ export function GraphWrapper({
349349
<section className="graph-app__banners">
350350
{showPreview && (
351351
<div className="alert">
352-
<span className="alert__icon codicon codicon-search"></span>
352+
<span className="alert__icon codicon codicon-eye"></span>
353353
<div className="alert__content">
354-
<p className="alert__title">Preview Feature</p>
354+
<p className="alert__title">GitLens+ Feature Preview</p>
355355
<p className="alert__message">
356-
The Commit Graph is a ✨ GitLens+ feature currently in preview. It is freely available
357-
for local and public repos, while a paid account is required for use on private repos.
358-
We welcome your feedback in our{' '}
359-
<a href="https://github.com/gitkraken/vscode-gitlens/discussions/2158">
360-
Commit Graph discussion on GitHub
361-
</a>
362-
.
356+
The Commit Graph is freely available for local and public repos, while private repos
357+
require a paid plan. While this preview isn't yet fully featured, we are quickly working
358+
on the next release, when it will exit preview.
363359
</p>
360+
<p className="alert__accent">
361+
<span className="glicon glicon-clock alert__accent-icon" /> GitLens+ introductory
362+
pricing will end with the next release (late Sept, early Oct).
363+
</p>
364+
<p className="alert__accent">
365+
<span className="codicon codicon-feedback alert__accent-icon" /> Join the discussions on
366+
GitHub! We'd love to hear from you.
367+
</p>
368+
</div>
369+
<div className="alert__actions">
370+
<a className="alert-action" href="command:gitlens.plus.purchase">
371+
Get GitLens+
372+
</a>
373+
<a
374+
className="alert-action"
375+
href="https://github.com/gitkraken/vscode-gitlens/discussions/2158"
376+
>
377+
Give Feedback
378+
</a>
364379
</div>
365380
<button className="alert__dismiss" type="button" onClick={() => handleDismissPreview()}>
366381
<span className="codicon codicon-chrome-close"></span>

src/webviews/apps/plus/graph/graph.scss

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import '../../shared/base';
22
@import '../../shared/codicons';
3+
@import '../../shared/glicons';
34
@import '../../../../../node_modules/@gitkraken/gitkraken-components/dist/styles.css';
45

56
body {
@@ -158,32 +159,48 @@ a {
158159
color: var(--alert-foreground);
159160

160161
&__icon {
162+
&,
163+
&[class*=codicon-] {
164+
font-size: 2rem;
165+
}
161166
}
162167

163168
&__content {
164169
flex: 1;
165-
padding-top: 0.24rem;
166-
> :last-child {
170+
padding-top: 0.1rem;
171+
> *:not(:first-child) {
172+
margin-top: 0.75rem;
173+
}
174+
> * {
167175
margin-bottom: 0;
168176
}
169177
}
170178
&__title {
171179
font-size: 1.3rem;
172180
font-weight: 700;
173-
margin: 0;
174181
text-transform: uppercase;
182+
margin-top: 0;
175183
}
176184
&__message {
177185
font-size: 1.2rem;
178-
margin: 0;
179186
}
180187

181-
&__title + &__message {
182-
margin-top: 0.25rem;
188+
&__accent {
189+
&-icon {
190+
margin-right: 0.2rem;
191+
line-height: 1.4rem;
192+
vertical-align: bottom;
193+
}
194+
}
195+
&__accent + &__accent {
196+
margin-top: 0.2rem;
183197
}
184198

185199
&__actions {
186200
align-self: center;
201+
display: flex;
202+
flex-direction: column;
203+
gap: 0.75rem;
187204
}
188205

189206
&__dismiss {

src/webviews/apps/shared/glicons.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@font-face {
22
font-family: 'glicons';
33
font-display: block;
4-
src: url("./glicons.woff2?4e20ad02a9897de1654835070707d360") format("woff2");
4+
src: url("./glicons.woff2?2e51fe40df2abdf6a27fbae6c29587b1") format("woff2");
55
}
66

77
.glicon {
@@ -142,3 +142,6 @@
142142
.glicon-pinned-filled:before {
143143
content: '\f11c';
144144
}
145+
.glicon-clock:before {
146+
content: '\f11d';
147+
}

0 commit comments

Comments
 (0)