From a545652bdf8fd3ae4b2f3534312e840ac388a7a0 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 1 Jun 2023 14:24:42 -0400 Subject: [PATCH] Adds interactivity to revision section --- src/webviews/apps/welcome/welcome.html | 53 +++++++++++++++++++++++++--------- src/webviews/apps/welcome/welcome.scss | 46 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 22 deletions(-) diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html index 3454a0d..7e97988 100644 --- a/src/webviews/apps/welcome/welcome.html +++ b/src/webviews/apps/welcome/welcome.html @@ -109,7 +109,7 @@ d="M63.7253 7.5C63.4744 4.9733 61.3427 3 58.75 3C56.1573 3 54.0256 4.9733 53.7747 7.5H53V8.5H53.7747C54.0256 11.0267 56.1573 13 58.75 13C61.3427 13 63.4745 11.0267 63.7253 8.5H67.4358L65 10.9358L65.7071 11.6429L69 8.35V7.6429L65.7071 4.35L65 5.0571L67.4393 7.4964V7.5H63.7253ZM58.75 4C60.9591 4 62.75 5.7909 62.75 8C62.75 10.2091 60.9591 12 58.75 12C56.5409 12 54.75 10.2091 54.75 8C54.75 5.7909 56.5409 4 58.75 4Z" /> - + @@ -118,6 +118,7 @@ /> 12 13 - + @@ -168,7 +169,7 @@ - + functiongitlens(git:object){ returnsupercharged(git);| @@ -187,12 +188,21 @@ fill="none" xmlns="http://www.w3.org/2000/svg" > - + + + @@ -200,7 +210,18 @@ d="M63.7253 7.5C63.4744 4.9733 61.3427 3 58.75 3C56.1573 3 54.0256 4.9733 53.7747 7.5H53V8.5H53.7747C54.0256 11.0267 56.1573 13 58.75 13C61.3427 13 63.4745 11.0267 63.7253 8.5H67.4358L65 10.9358L65.7071 11.6429L69 8.35V7.6429L65.7071 4.35L65 5.0571L67.4393 7.4964V7.5H63.7253ZM58.75 4C60.9591 4 62.75 5.7909 62.75 8C62.75 10.2091 60.9591 12 58.75 12C56.5409 12 54.75 10.2091 54.75 8C54.75 5.7909 56.5409 4 58.75 4Z" /> - + + + @@ -235,19 +256,23 @@ - - - - - - 12functiongitlens(git:object){ - 13returnsupercharged(git); + + + + + + + 12functiongitlens(git:object){ + 13returnsupercharged(git); + + - + + 12functiongitlens(git:object){ 13returnsuperDuperCharged(git);| - +

Side Bar Views

diff --git a/src/webviews/apps/welcome/welcome.scss b/src/webviews/apps/welcome/welcome.scss index bf19311..120e292 100644 --- a/src/webviews/apps/welcome/welcome.scss +++ b/src/webviews/apps/welcome/welcome.scss @@ -489,12 +489,12 @@ gk-card p { } &-added-text { - outline: 1px solid green; //var(--vscode-diffEditor-insertedTextBackground) - fill: green; //var(--vscode-diffEditor-insertedTextBackground); + outline: 1px solid green; + fill: green; } &-splitter { - fill: var(--vscode-editorGroup-border); + stroke: var(--vscode-editorGroup-border); } } @@ -504,7 +504,7 @@ gk-card p { &-icon { fill: var(--vscode-icon-foreground); - &-annotations { + &__annotations { path:first-child { fill: #f05133; stroke: none; @@ -527,6 +527,20 @@ gk-card p { } } + &__revision { + body[data-feature-revision='off'] & { + fill: none; + + path.active { + opacity: 0.6; + } + } + } + + &__interactive { + cursor: pointer; + } + &-accent { fill: var(--color-foreground); opacity: 0.2; @@ -605,13 +619,15 @@ body[data-feature-blame='off'] { } } -.editor-blame-block, +.editor-annotations-left, +.editor-revision-left, [data-feature-blame='on'], [data-feature-codelens='on'] { transition: opacity 150ms ease-in-out; } -.editor-code-block { +.editor-annotations-right, +.editor-revision-right { transition: transform 150ms ease-in-out; } @@ -622,10 +638,24 @@ body[data-feature-codelens='off'] { } body[data-feature-annotations='off'] { - .editor-blame-block { + .editor-annotations-left { opacity: 0; } - .editor-code-block { + .editor-annotations-right { transform: translateX(-242px); } } + +body[data-feature-revision='off'] { + .editor-revision-left { + opacity: 0; + } + .editor-revision-right { + transform: translateX(-283px); + + .editor-added-text { + outline-color: transparent; + fill: inherit; + } + } +}