Browse Source

Replaces webview template tokens because prettier 😠

main
Eric Amodio 5 years ago
parent
commit
25d71be263
4 changed files with 85 additions and 165 deletions
  1. +78
    -155
      src/webviews/apps/settings/index.html
  2. +2
    -5
      src/webviews/apps/welcome/index.html
  3. +4
    -4
      src/webviews/webviewBase.ts
  4. +1
    -1
      webpack.config.js

+ 78
- 155
src/webviews/apps/settings/index.html View File

@ -125,8 +125,7 @@
<header>
<a class="header__link" title="Learn more about GitLens" href="https://gitlens.amod.io">
<div class="header__logo">
<!-- prettier-ignore-attribute src -->
<img class="image__logo" src="{{root}}/images/gitlens-icon.png" />
<img class="image__logo" src="#{root}/images/gitlens-icon.png" />
<div>
<h1>Git<span class="header__logo--highlight">Lens</span></h1>
<p class="header__subtitle">Git supercharged</p>
@ -918,18 +917,15 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="{{root}}/images/settings/current-line-blame.png" />
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="#{root}/images/settings/current-line-blame.png" />
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/current-line-blame-on.png"
src="#{root}/images/settings/current-line-blame-on.png"
data-visibility="currentLine.enabled"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/current-line-blame-on-scrollable.png"
src="#{root}/images/settings/current-line-blame-on-scrollable.png"
data-visibility="currentLine.enabled &amp; currentLine.scrollable"
/>
</div>
@ -1114,58 +1110,49 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/blame.png"
src="#{root}/images/settings/blame.png"
data-visibility="blame.compact =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/blame-compact.png"
src="#{root}/images/settings/blame-compact.png"
data-visibility="blame.compact"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/blame-avatars.png"
src="#{root}/images/settings/blame-avatars.png"
data-visibility="blame.avatars &amp; blame.compact =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/blame-avatars-compact.png"
src="#{root}/images/settings/blame-avatars-compact.png"
data-visibility="blame.avatars &amp; blame.compact"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/blame-highlight-gutter.png"
src="#{root}/images/settings/blame-highlight-gutter.png"
data-visibility="blame.highlight.enabled &amp; blame.highlight.locations +gutter"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/blame-highlight-line.png"
src="#{root}/images/settings/blame-highlight-line.png"
data-visibility="blame.highlight.enabled &amp; blame.highlight.locations +line"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/blame-highlight-scrollbar.png"
src="#{root}/images/settings/blame-highlight-scrollbar.png"
data-visibility="blame.highlight.enabled &amp; blame.highlight.locations +overview"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/blame-heatmap-left.png"
src="#{root}/images/settings/blame-heatmap-left.png"
data-visibility="blame.heatmap.enabled &amp; blame.heatmap.location =left"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/blame-heatmap-right.png"
src="#{root}/images/settings/blame-heatmap-right.png"
data-visibility="blame.heatmap.enabled &amp; blame.heatmap.location =right"
/>
</div>
@ -1335,119 +1322,100 @@
</div>
<div class="section__preview mb-2">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/hovers-currentLine-line.png"
src="#{root}/images/settings/hovers-currentLine-line.png"
data-visibility="hovers.currentLine.over =line"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/hovers-currentLine-line.png"
src="#{root}/images/settings/hovers-currentLine-line.png"
data-visibility="currentLine.enabled =false &amp; hovers.currentLine.over =annotation"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-blame.png"
src="#{root}/images/settings/hovers-currentLine-line-blame.png"
data-visibility="currentLine.enabled &amp; hovers.currentLine.over =line"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details+changes-avatars.png"
src="#{root}/images/settings/hovers-currentLine-line-details+changes-avatars.png"
data-visibility="hovers.currentLine.over =line &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details+changes-avatars.png"
src="#{root}/images/settings/hovers-currentLine-line-details+changes-avatars.png"
data-visibility="currentLine.enabled =false &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details+changes.png"
src="#{root}/images/settings/hovers-currentLine-line-details+changes.png"
data-visibility="hovers.currentLine.over =line &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details+changes.png"
src="#{root}/images/settings/hovers-currentLine-line-details+changes.png"
data-visibility="currentLine.enabled =false &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details-avatars.png"
src="#{root}/images/settings/hovers-currentLine-line-details-avatars.png"
data-visibility="hovers.currentLine.over =line &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes =false &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details-avatars.png"
src="#{root}/images/settings/hovers-currentLine-line-details-avatars.png"
data-visibility="currentLine.enabled =false &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes =false &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details.png"
src="#{root}/images/settings/hovers-currentLine-line-details.png"
data-visibility="hovers.currentLine.over =line &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes =false &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-details.png"
src="#{root}/images/settings/hovers-currentLine-line-details.png"
data-visibility="currentLine.enabled =false &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes =false &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-changes.png"
src="#{root}/images/settings/hovers-currentLine-line-changes.png"
data-visibility="hovers.currentLine.over =line &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details =false &amp; hovers.currentLine.changes"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-line-changes.png"
src="#{root}/images/settings/hovers-currentLine-line-changes.png"
data-visibility="currentLine.enabled =false &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details =false &amp; hovers.currentLine.changes"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/hovers-currentLine-annotation.png"
src="#{root}/images/settings/hovers-currentLine-annotation.png"
data-visibility="currentLine.enabled &amp; hovers.currentLine.over =annotation"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-annotation-details+changes-avatars.png"
src="#{root}/images/settings/hovers-currentLine-annotation-details+changes-avatars.png"
data-visibility="currentLine.enabled &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-annotation-details+changes.png"
src="#{root}/images/settings/hovers-currentLine-annotation-details+changes.png"
data-visibility="currentLine.enabled &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-annotation-details-avatars.png"
src="#{root}/images/settings/hovers-currentLine-annotation-details-avatars.png"
data-visibility="currentLine.enabled &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes =false &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-annotation-details.png"
src="#{root}/images/settings/hovers-currentLine-annotation-details.png"
data-visibility="currentLine.enabled &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details &amp; hovers.currentLine.changes =false &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-currentLine-annotation-changes.png"
src="#{root}/images/settings/hovers-currentLine-annotation-changes.png"
data-visibility="currentLine.enabled &amp; hovers.currentLine.over =annotation &amp; hovers.enabled &amp; hovers.currentLine.enabled &amp; hovers.currentLine.details =false &amp; hovers.currentLine.changes"
/>
</div>
@ -1515,52 +1483,44 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/hovers-annotations.png"
src="#{root}/images/settings/hovers-annotations.png"
data-visibility="blame.compact =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/hovers-annotations-compact.png"
src="#{root}/images/settings/hovers-annotations-compact.png"
data-visibility="blame.compact"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-annotations-details+changes-avatars.png"
src="#{root}/images/settings/hovers-annotations-details+changes-avatars.png"
data-visibility="hovers.enabled &amp; hovers.annotations.enabled &amp; hovers.annotations.details &amp; hovers.annotations.changes &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-annotations-details+changes.png"
src="#{root}/images/settings/hovers-annotations-details+changes.png"
data-visibility="hovers.enabled &amp; hovers.annotations.enabled &amp; hovers.annotations.details &amp; hovers.annotations.changes &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-annotations-details-avatars.png"
src="#{root}/images/settings/hovers-annotations-details-avatars.png"
data-visibility="hovers.enabled &amp; hovers.annotations.enabled &amp; hovers.annotations.details &amp; hovers.annotations.changes =false &amp; hovers.avatars"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-annotations-details.png"
src="#{root}/images/settings/hovers-annotations-details.png"
data-visibility="hovers.enabled &amp; hovers.annotations.enabled &amp; hovers.annotations.details &amp; hovers.annotations.changes =false &amp; hovers.avatars =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-annotations-changes.png"
src="#{root}/images/settings/hovers-annotations-changes.png"
data-visibility="hovers.enabled &amp; hovers.annotations.enabled &amp; hovers.annotations.details =false &amp; hovers.annotations.changes"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/hovers-annotations-heatmap.png"
src="#{root}/images/settings/hovers-annotations-heatmap.png"
data-visibility="blame.heatmap.enabled &amp; blame.heatmap.location =right"
/>
</div>
@ -1732,62 +1692,52 @@
</div>
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="{{root}}/images/settings/code-lens.png" />
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="#{root}/images/settings/code-lens.png" />
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-file-recent+authors.png"
src="#{root}/images/settings/code-lens-file-recent+authors.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled &amp; codeLens.authors.enabled &amp; codeLens.scopes +document"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-file-recent.png"
src="#{root}/images/settings/code-lens-file-recent.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled &amp; codeLens.authors.enabled =false &amp; codeLens.scopes +document"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-file-authors.png"
src="#{root}/images/settings/code-lens-file-authors.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled =false &amp; codeLens.authors.enabled &amp; codeLens.scopes +document"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-containers-recent+authors.png"
src="#{root}/images/settings/code-lens-containers-recent+authors.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled &amp; codeLens.authors.enabled &amp; codeLens.scopes +containers"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-containers-recent.png"
src="#{root}/images/settings/code-lens-containers-recent.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled &amp; codeLens.authors.enabled =false &amp; codeLens.scopes +containers"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-containers-authors.png"
src="#{root}/images/settings/code-lens-containers-authors.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled =false &amp; codeLens.authors.enabled &amp; codeLens.scopes +containers"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-blocks-recent+authors.png"
src="#{root}/images/settings/code-lens-blocks-recent+authors.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled &amp; codeLens.authors.enabled &amp; codeLens.scopes +blocks"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-blocks-recent.png"
src="#{root}/images/settings/code-lens-blocks-recent.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled &amp; codeLens.authors.enabled =false &amp; codeLens.scopes +blocks"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/code-lens-blocks-authors.png"
src="#{root}/images/settings/code-lens-blocks-authors.png"
data-visibility="codeLens.enabled &amp; codeLens.recentChange.enabled =false &amp; codeLens.authors.enabled &amp; codeLens.scopes +blocks"
/>
</div>
@ -1844,8 +1794,7 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="{{root}}/images/settings/heatmap.png" />
<img class="image__preview" src="#{root}/images/settings/heatmap.png" />
</div>
<p class="settings-group__hint">
@ -1941,24 +1890,20 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="{{root}}/images/settings/recent-changes.png" />
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="#{root}/images/settings/recent-changes.png" />
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/recent-changes-highlight-gutter.png"
src="#{root}/images/settings/recent-changes-highlight-gutter.png"
data-visibility="recentChanges.highlight.locations +gutter"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/recent-changes-highlight-line.png"
src="#{root}/images/settings/recent-changes-highlight-line.png"
data-visibility="recentChanges.highlight.locations +line"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/recent-changes-highlight-scrollbar.png"
src="#{root}/images/settings/recent-changes-highlight-scrollbar.png"
data-visibility="recentChanges.highlight.locations +overview"
/>
</div>
@ -2104,18 +2049,15 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="{{root}}/images/settings/status-bar.png" />
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="#{root}/images/settings/status-bar.png" />
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/status-bar-left.png"
src="#{root}/images/settings/status-bar-left.png"
data-visibility="statusBar.enabled &amp; statusBar.alignment =left"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/status-bar-right.png"
src="#{root}/images/settings/status-bar-right.png"
data-visibility="statusBar.enabled &amp; statusBar.alignment =right"
/>
</div>
@ -2315,28 +2257,24 @@
</div>
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-repositories.png"
src="#{root}/images/settings/view-repositories.png"
data-visibility="views.repositories.enabled &amp; views.repositories.files.layout !tree"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-repositories-tree-compact.png"
src="#{root}/images/settings/view-repositories-tree-compact.png"
data-visibility="views.repositories.enabled &amp; views.repositories.files.layout =tree &amp; views.repositories.files.compact"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-repositories-tree.png"
src="#{root}/images/settings/view-repositories-tree.png"
data-visibility="views.repositories.enabled &amp; views.repositories.files.layout =tree &amp; views.repositories.files.compact =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/view-repositories-avatars.png"
src="#{root}/images/settings/view-repositories-avatars.png"
data-visibility="views.repositories.enabled &amp; views.repositories.avatars"
/>
</div>
@ -2415,16 +2353,14 @@
</div>
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-file-history.png"
src="#{root}/images/settings/view-file-history.png"
data-visibility="views.fileHistory.enabled"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/view-file-history-avatars.png"
src="#{root}/images/settings/view-file-history-avatars.png"
data-visibility="views.fileHistory.enabled &amp; views.fileHistory.avatars"
/>
</div>
@ -2492,16 +2428,14 @@
</div>
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-line-history.png"
src="#{root}/images/settings/view-line-history.png"
data-visibility="views.lineHistory.enabled"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/view-line-history-avatars.png"
src="#{root}/images/settings/view-line-history-avatars.png"
data-visibility="views.lineHistory.enabled &amp; views.lineHistory.avatars"
/>
</div>
@ -2598,28 +2532,24 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-search.png"
src="#{root}/images/settings/view-search.png"
data-visibility="views.search.enabled &amp; views.search.files.layout !tree"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-search-tree-compact.png"
src="#{root}/images/settings/view-search-tree-compact.png"
data-visibility="views.search.enabled &amp; views.search.files.layout =tree &amp; views.search.files.compact"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-search-tree.png"
src="#{root}/images/settings/view-search-tree.png"
data-visibility="views.search.enabled &amp; views.search.files.layout =tree &amp; views.search.files.compact =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/view-search-avatars.png"
src="#{root}/images/settings/view-search-avatars.png"
data-visibility="views.search.enabled &amp; views.search.avatars"
/>
</div>
@ -2726,28 +2656,24 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-compare.png"
src="#{root}/images/settings/view-compare.png"
data-visibility="views.compare.enabled &amp; views.compare.files.layout !tree"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-compare-tree-compact.png"
src="#{root}/images/settings/view-compare-tree-compact.png"
data-visibility="views.compare.enabled &amp; views.compare.files.layout =tree &amp; views.compare.files.compact"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview hidden"
src="{{root}}/images/settings/view-compare-tree.png"
src="#{root}/images/settings/view-compare-tree.png"
data-visibility="views.compare.enabled &amp; views.compare.files.layout =tree &amp; views.compare.files.compact =false"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/view-compare-avatars.png"
src="#{root}/images/settings/view-compare-avatars.png"
data-visibility="views.compare.enabled &amp; views.compare.avatars"
/>
</div>
@ -2810,18 +2736,15 @@
</div>
<div class="section__preview">
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="{{root}}/images/settings/status-bar.png" />
<!-- prettier-ignore-attribute src -->
<img class="image__preview" src="#{root}/images/settings/status-bar.png" />
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/modes-status-bar-left.png"
src="#{root}/images/settings/modes-status-bar-left.png"
data-visibility="mode.statusBar.enabled &amp; mode.statusBar.alignment =left"
/>
<!-- prettier-ignore-attribute src -->
<img
class="image__preview--overlay hidden"
src="{{root}}/images/settings/modes-status-bar-right.png"
src="#{root}/images/settings/modes-status-bar-right.png"
data-visibility="mode.statusBar.enabled &amp; mode.statusBar.alignment =right"
/>
</div>
@ -3044,6 +2967,6 @@
</div>
</div>
{{ endOfBody }}
#{endOfBody}
</body>
</html>

+ 2
- 5
src/webviews/apps/welcome/index.html View File

@ -24,8 +24,7 @@
<header>
<a class="header__link" title="Learn more about GitLens" href="https://gitlens.amod.io">
<div class="header__logo">
<!-- prettier-ignore-attribute src -->
<img class="image__logo" src="{{root}}/images/gitlens-icon.png" />
<img class="image__logo" src="#{root}/images/gitlens-icon.png" />
<div>
<h1>Git<span class="header__logo--highlight">Lens</span></h1>
<p class="header__subtitle">Git supercharged</p>
@ -409,13 +408,11 @@
title="Try CodeStream"
href="https://codestream.com/?utm_source=gitlens_welcome&utm_medium=banner&utm_campaign=gitlens"
>
<!-- prettier-ignore-attribute src -->
<img
class="sponsor__image light"
src="https://alt-images.codestream.com/codestream_logo_gitlens_welcome_dark.png"
alt="CodeStream Logo"
/>
<!-- prettier-ignore-attribute src -->
<img
class="sponsor__image dark"
src="https://alt-images.codestream.com/codestream_logo_gitlens_welcome_light.png"
@ -524,6 +521,6 @@
</div>
</div>
</div>
{{ endOfBody }}
#{endOfBody}
</body>
</html>

+ 4
- 4
src/webviews/webviewBase.ts View File

@ -200,22 +200,22 @@ export abstract class WebviewBase implements Disposable {
}
let html = content.replace(
/{{root}}/g,
/#{root}/g,
Uri.file(Container.context.asAbsolutePath('.'))
.with({ scheme: 'vscode-resource' })
.toString()
);
if (this.renderHead) {
html = html.replace(/{{\s*?head\s*?}}/i, await this.renderHead());
html = html.replace(/#{head}/i, await this.renderHead());
}
if (this.renderBody) {
html = html.replace(/{{\s*?body\s*?}}/i, await this.renderBody());
html = html.replace(/#{body}/i, await this.renderBody());
}
if (this.renderEndOfBody) {
html = html.replace(/{{\s*?endOfBody\s*?}}/i, await this.renderEndOfBody());
html = html.replace(/#{endOfBody}/i, await this.renderEndOfBody());
}
this._html = html;

+ 1
- 1
webpack.config.js View File

@ -219,7 +219,7 @@ function getWebviewsConfig(env) {
output: {
filename: '[name].js',
path: path.resolve(__dirname, 'dist/webviews'),
publicPath: '{{root}}/dist/webviews/'
publicPath: '#{root}/dist/webviews/'
},
module: {
rules: [

Loading…
Cancel
Save