Browse Source

Updates graph preview banner content

main
Keith Daulton 2 years ago
parent
commit
8cab03b51e
6 changed files with 61 additions and 17 deletions
  1. +1
    -0
      images/icons/clock.svg
  2. +2
    -1
      images/icons/template/mapping.json
  3. +7
    -0
      package.json
  4. +24
    -9
      src/webviews/apps/plus/graph/GraphWrapper.tsx
  5. +23
    -6
      src/webviews/apps/plus/graph/graph.scss
  6. +4
    -1
      src/webviews/apps/shared/glicons.scss

+ 1
- 0
images/icons/clock.svg View File

@ -0,0 +1 @@
<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M8 8L11 8V7L7.5 7L7 7.5L7 11H8L8 8Z"/><path d="M8 13C5.23858 13 3 10.7614 3 8C3 5.23858 5.23858 3 8 3C10.7614 3 13 5.23858 13 8C13 10.7614 10.7614 13 8 13ZM8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z"/></svg>

+ 2
- 1
images/icons/template/mapping.json View File

@ -28,5 +28,6 @@
"expand": 61721,
"list-auto": 61722,
"arrow-up-force": 61723,
"pinned-filled": 61724
"pinned-filled": 61724,
"clock": 61725
}

+ 7
- 0
package.json View File

@ -6394,6 +6394,13 @@
"fontPath": "dist/glicons.woff2",
"fontCharacter": "\\f11c"
}
},
"gitlens-clock": {
"description": "clock icon",
"default": {
"fontPath": "dist/glicons.woff2",
"fontCharacter": "\\f11d"
}
}
},
"menus": {

+ 24
- 9
src/webviews/apps/plus/graph/GraphWrapper.tsx View File

@ -349,18 +349,33 @@ export function GraphWrapper({
<section className="graph-app__banners">
{showPreview && (
<div className="alert">
<span className="alert__icon codicon codicon-search"></span>
<span className="alert__icon codicon codicon-eye"></span>
<div className="alert__content">
<p className="alert__title">Preview Feature</p>
<p className="alert__title">GitLens+ Feature Preview</p>
<p className="alert__message">
The Commit Graph is a GitLens+ feature currently in preview. It is freely available
for local and public repos, while a paid account is required for use on private repos.
We welcome your feedback in our{' '}
<a href="https://github.com/gitkraken/vscode-gitlens/discussions/2158">
Commit Graph discussion on GitHub
</a>
.
The Commit Graph is freely available for local and public repos, while private repos
require a paid plan. While this preview isn't yet fully featured, we are quickly working
on the next release, when it will exit preview.
</p>
<p className="alert__accent">
<span className="glicon glicon-clock alert__accent-icon" /> GitLens+ introductory
pricing will end with the next release (late Sept, early Oct).
</p>
<p className="alert__accent">
<span className="codicon codicon-feedback alert__accent-icon" /> Join the discussions on
GitHub! We'd love to hear from you.
</p>
</div>
<div className="alert__actions">
<a className="alert-action" href="command:gitlens.plus.purchase">
Get GitLens+
</a>
<a
className="alert-action"
href="https://github.com/gitkraken/vscode-gitlens/discussions/2158"
>
Give Feedback
</a>
</div>
<button className="alert__dismiss" type="button" onClick={() => handleDismissPreview()}>
<span className="codicon codicon-chrome-close"></span>

+ 23
- 6
src/webviews/apps/plus/graph/graph.scss View File

@ -1,5 +1,6 @@
@import '../../shared/base';
@import '../../shared/codicons';
@import '../../shared/glicons';
@import '../../../../../node_modules/@gitkraken/gitkraken-components/dist/styles.css';
body {
@ -158,32 +159,48 @@ a {
color: var(--alert-foreground);
&__icon {
&,
&[class*=codicon-] {
font-size: 2rem;
}
}
&__content {
flex: 1;
padding-top: 0.24rem;
> :last-child {
padding-top: 0.1rem;
> *:not(:first-child) {
margin-top: 0.75rem;
}
> * {
margin-bottom: 0;
}
}
&__title {
font-size: 1.3rem;
font-weight: 700;
margin: 0;
text-transform: uppercase;
margin-top: 0;
}
&__message {
font-size: 1.2rem;
margin: 0;
}
&__title + &__message {
margin-top: 0.25rem;
&__accent {
&-icon {
margin-right: 0.2rem;
line-height: 1.4rem;
vertical-align: bottom;
}
}
&__accent + &__accent {
margin-top: 0.2rem;
}
&__actions {
align-self: center;
display: flex;
flex-direction: column;
gap: 0.75rem;
}
&__dismiss {

+ 4
- 1
src/webviews/apps/shared/glicons.scss View File

@ -1,7 +1,7 @@
@font-face {
font-family: 'glicons';
font-display: block;
src: url("./glicons.woff2?4e20ad02a9897de1654835070707d360") format("woff2");
src: url("./glicons.woff2?2e51fe40df2abdf6a27fbae6c29587b1") format("woff2");
}
.glicon {
@ -142,3 +142,6 @@
.glicon-pinned-filled:before {
content: '\f11c';
}
.glicon-clock:before {
content: '\f11d';
}

Loading…
Cancel
Save