diff --git a/images/dark/icon-add.svg b/images/dark/icon-add.svg deleted file mode 100644 index c82bcad..0000000 --- a/images/dark/icon-add.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-clear.svg b/images/dark/icon-clear.svg deleted file mode 100644 index 60a11a1..0000000 --- a/images/dark/icon-clear.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-close.svg b/images/dark/icon-close.svg deleted file mode 100644 index 7ee48ac..0000000 --- a/images/dark/icon-close.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-commit.svg b/images/dark/icon-commit.svg deleted file mode 100644 index bc977cb..0000000 --- a/images/dark/icon-commit.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-compare-refs.svg b/images/dark/icon-compare-refs.svg deleted file mode 100644 index a1a8b2e..0000000 --- a/images/dark/icon-compare-refs.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-delete.svg b/images/dark/icon-delete.svg deleted file mode 100644 index 06101db..0000000 --- a/images/dark/icon-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-download.svg b/images/dark/icon-download.svg deleted file mode 100644 index 879b58e..0000000 --- a/images/dark/icon-download.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-ellipsis.svg b/images/dark/icon-ellipsis.svg deleted file mode 100644 index 9a1aaaf..0000000 --- a/images/dark/icon-ellipsis.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-gear.svg b/images/dark/icon-gear.svg deleted file mode 100644 index dd8dcb1..0000000 --- a/images/dark/icon-gear.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-heart.svg b/images/dark/icon-heart.svg deleted file mode 100644 index afa9f21..0000000 --- a/images/dark/icon-heart.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-help.svg b/images/dark/icon-help.svg deleted file mode 100644 index e6687ea..0000000 --- a/images/dark/icon-help.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/images/dark/icon-history.svg b/images/dark/icon-history.svg deleted file mode 100644 index 1572f98..0000000 --- a/images/dark/icon-history.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-link-color.svg b/images/dark/icon-link-color.svg deleted file mode 100644 index 1b257ba..0000000 --- a/images/dark/icon-link-color.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-link.svg b/images/dark/icon-link.svg deleted file mode 100644 index aac4ddf..0000000 --- a/images/dark/icon-link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-location-filled.svg b/images/dark/icon-location-filled.svg deleted file mode 100644 index d1cf07a..0000000 --- a/images/dark/icon-location-filled.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-location.svg b/images/dark/icon-location.svg deleted file mode 100644 index 105b0de..0000000 --- a/images/dark/icon-location.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-lock.svg b/images/dark/icon-lock.svg deleted file mode 100644 index 99dcf25..0000000 --- a/images/dark/icon-lock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-locked.svg b/images/dark/icon-locked.svg deleted file mode 100644 index ac02faa..0000000 --- a/images/dark/icon-locked.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-merge.svg b/images/dark/icon-merge.svg deleted file mode 100644 index b0a5b96..0000000 --- a/images/dark/icon-merge.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/images/dark/icon-minus.svg b/images/dark/icon-minus.svg deleted file mode 100644 index 31f2423..0000000 --- a/images/dark/icon-minus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-open-file.svg b/images/dark/icon-open-file.svg deleted file mode 100644 index 1e10952..0000000 --- a/images/dark/icon-open-file.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-open-folder.svg b/images/dark/icon-open-folder.svg deleted file mode 100644 index 630d5ba..0000000 --- a/images/dark/icon-open-folder.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-open-working-file.svg b/images/dark/icon-open-working-file.svg deleted file mode 100644 index d13d95e..0000000 --- a/images/dark/icon-open-working-file.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-pencil.svg b/images/dark/icon-pencil.svg deleted file mode 100644 index c1b7500..0000000 --- a/images/dark/icon-pencil.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-people.svg b/images/dark/icon-people.svg deleted file mode 100644 index 1f2e93b..0000000 --- a/images/dark/icon-people.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-plug.svg b/images/dark/icon-plug.svg deleted file mode 100644 index a7f3036..0000000 --- a/images/dark/icon-plug.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/images/dark/icon-pull.svg b/images/dark/icon-pull.svg deleted file mode 100644 index 89ed236..0000000 --- a/images/dark/icon-pull.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-push.svg b/images/dark/icon-push.svg deleted file mode 100644 index 6bcd599..0000000 --- a/images/dark/icon-push.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-rebase.svg b/images/dark/icon-rebase.svg deleted file mode 100644 index f71377e..0000000 --- a/images/dark/icon-rebase.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-refresh.svg b/images/dark/icon-refresh.svg deleted file mode 100644 index 5a29e48..0000000 --- a/images/dark/icon-refresh.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-search.svg b/images/dark/icon-search.svg deleted file mode 100644 index 139f0ee..0000000 --- a/images/dark/icon-search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-star-filled.svg b/images/dark/icon-star-filled.svg deleted file mode 100644 index 00dda76..0000000 --- a/images/dark/icon-star-filled.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-star.svg b/images/dark/icon-star.svg deleted file mode 100644 index 18367de..0000000 --- a/images/dark/icon-star.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-sync.svg b/images/dark/icon-sync.svg deleted file mode 100644 index 4905c19..0000000 --- a/images/dark/icon-sync.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-upload.svg b/images/dark/icon-upload.svg deleted file mode 100644 index 2b275d5..0000000 --- a/images/dark/icon-upload.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-view-list.svg b/images/dark/icon-view-list.svg deleted file mode 100644 index 95f4866..0000000 --- a/images/dark/icon-view-list.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/images/dark/icon-view-tree.svg b/images/dark/icon-view-tree.svg deleted file mode 100644 index eb53f74..0000000 --- a/images/dark/icon-view-tree.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/images/dark/icon-vsts.svg b/images/dark/icon-vsts.svg deleted file mode 100644 index 124e595..0000000 --- a/images/dark/icon-vsts.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-add.svg b/images/light/icon-add.svg deleted file mode 100644 index 99b0606..0000000 --- a/images/light/icon-add.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-clear.svg b/images/light/icon-clear.svg deleted file mode 100644 index 3bf9c42..0000000 --- a/images/light/icon-clear.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-close.svg b/images/light/icon-close.svg deleted file mode 100644 index e9151cf..0000000 --- a/images/light/icon-close.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-commit.svg b/images/light/icon-commit.svg deleted file mode 100644 index c0a7a7d..0000000 --- a/images/light/icon-commit.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-compare-refs.svg b/images/light/icon-compare-refs.svg deleted file mode 100644 index 89e4881..0000000 --- a/images/light/icon-compare-refs.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-delete.svg b/images/light/icon-delete.svg deleted file mode 100644 index 1adf2ef..0000000 --- a/images/light/icon-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-download.svg b/images/light/icon-download.svg deleted file mode 100644 index 03d844c..0000000 --- a/images/light/icon-download.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-ellipsis.svg b/images/light/icon-ellipsis.svg deleted file mode 100644 index d5d65b1..0000000 --- a/images/light/icon-ellipsis.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-gear.svg b/images/light/icon-gear.svg deleted file mode 100644 index 9233a24..0000000 --- a/images/light/icon-gear.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-heart.svg b/images/light/icon-heart.svg deleted file mode 100644 index 0a8d5ef..0000000 --- a/images/light/icon-heart.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-help.svg b/images/light/icon-help.svg deleted file mode 100644 index 4c89ec8..0000000 --- a/images/light/icon-help.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/images/light/icon-history.svg b/images/light/icon-history.svg deleted file mode 100644 index 57c126e..0000000 --- a/images/light/icon-history.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-link-color.svg b/images/light/icon-link-color.svg deleted file mode 100644 index 05b8170..0000000 --- a/images/light/icon-link-color.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-link.svg b/images/light/icon-link.svg deleted file mode 100644 index cd005fa..0000000 --- a/images/light/icon-link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-location-filled.svg b/images/light/icon-location-filled.svg deleted file mode 100644 index f7c286b..0000000 --- a/images/light/icon-location-filled.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-location.svg b/images/light/icon-location.svg deleted file mode 100644 index f04bdb8..0000000 --- a/images/light/icon-location.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-lock.svg b/images/light/icon-lock.svg deleted file mode 100644 index ead44fc..0000000 --- a/images/light/icon-lock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-locked.svg b/images/light/icon-locked.svg deleted file mode 100644 index 199d919..0000000 --- a/images/light/icon-locked.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-merge.svg b/images/light/icon-merge.svg deleted file mode 100644 index 6e29923..0000000 --- a/images/light/icon-merge.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/images/light/icon-minus.svg b/images/light/icon-minus.svg deleted file mode 100644 index 2413a6a..0000000 --- a/images/light/icon-minus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-open-file.svg b/images/light/icon-open-file.svg deleted file mode 100644 index b1c7813..0000000 --- a/images/light/icon-open-file.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-open-folder.svg b/images/light/icon-open-folder.svg deleted file mode 100644 index 2e8a218..0000000 --- a/images/light/icon-open-folder.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-open-working-file.svg b/images/light/icon-open-working-file.svg deleted file mode 100644 index 54c7407..0000000 --- a/images/light/icon-open-working-file.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-pencil.svg b/images/light/icon-pencil.svg deleted file mode 100644 index f296d35..0000000 --- a/images/light/icon-pencil.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-people.svg b/images/light/icon-people.svg deleted file mode 100644 index ad3536b..0000000 --- a/images/light/icon-people.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-plug.svg b/images/light/icon-plug.svg deleted file mode 100644 index bd00c83..0000000 --- a/images/light/icon-plug.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/images/light/icon-pull.svg b/images/light/icon-pull.svg deleted file mode 100644 index db7ff01..0000000 --- a/images/light/icon-pull.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-push.svg b/images/light/icon-push.svg deleted file mode 100644 index c6573be..0000000 --- a/images/light/icon-push.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-rebase.svg b/images/light/icon-rebase.svg deleted file mode 100644 index 9e1595d..0000000 --- a/images/light/icon-rebase.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-refresh.svg b/images/light/icon-refresh.svg deleted file mode 100644 index 47d3897..0000000 --- a/images/light/icon-refresh.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-search.svg b/images/light/icon-search.svg deleted file mode 100644 index e7df2a7..0000000 --- a/images/light/icon-search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-star-filled.svg b/images/light/icon-star-filled.svg deleted file mode 100644 index afd724b..0000000 --- a/images/light/icon-star-filled.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-star.svg b/images/light/icon-star.svg deleted file mode 100644 index 73098ba..0000000 --- a/images/light/icon-star.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-sync.svg b/images/light/icon-sync.svg deleted file mode 100644 index 5bc948f..0000000 --- a/images/light/icon-sync.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-upload.svg b/images/light/icon-upload.svg deleted file mode 100644 index 7c03eb1..0000000 --- a/images/light/icon-upload.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-view-list.svg b/images/light/icon-view-list.svg deleted file mode 100644 index c60fee5..0000000 --- a/images/light/icon-view-list.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/images/light/icon-view-tree.svg b/images/light/icon-view-tree.svg deleted file mode 100644 index e1dd1ac..0000000 --- a/images/light/icon-view-tree.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/images/light/icon-vsts.svg b/images/light/icon-vsts.svg deleted file mode 100644 index 122998f..0000000 --- a/images/light/icon-vsts.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/package.json b/package.json index 293dda2..b1f55c8 100644 --- a/package.json +++ b/package.json @@ -2071,64 +2071,43 @@ "command": "gitlens.supportGitLens", "title": "Sponsor GitLens ❤", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-heart.svg", - "light": "images/light/icon-heart.svg" - } + "icon": "$(heart)" }, { "command": "gitlens.showSettingsPage", "title": "Open Settings", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-gear.svg", - "light": "images/light/icon-gear.svg" - } + "icon": "$(gear)" }, { "command": "gitlens.showSettingsPage#repositories-view", "title": "Open Settings", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-gear.svg", - "light": "images/light/icon-gear.svg" - } + "icon": "$(gear)" }, { "command": "gitlens.showSettingsPage#file-history-view", "title": "Open Settings", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-gear.svg", - "light": "images/light/icon-gear.svg" - } + "icon": "$(gear)" }, { "command": "gitlens.showSettingsPage#line-history-view", "title": "Open Settings", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-gear.svg", - "light": "images/light/icon-gear.svg" - } + "icon": "$(gear)" }, { "command": "gitlens.showSettingsPage#search-commits-view", "title": "Open Settings", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-gear.svg", - "light": "images/light/icon-gear.svg" - } + "icon": "$(gear)" }, { "command": "gitlens.showSettingsPage#compare-view", "title": "Open Settings", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-gear.svg", - "light": "images/light/icon-gear.svg" - } + "icon": "$(gear)" }, { "command": "gitlens.showWelcomePage", @@ -2339,10 +2318,7 @@ "command": "gitlens.showCommitSearch", "title": "Search Commits", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-search.svg", - "light": "images/light/icon-search.svg" - } + "icon": "$(search)" }, { "command": "gitlens.showLastQuickPick", @@ -2418,10 +2394,7 @@ "command": "gitlens.connectRemoteProvider", "title": "Connect to Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-plug.svg", - "light": "images/light/icon-plug.svg" - } + "icon": "$(plug)" }, { "command": "gitlens.disconnectRemoteProvider", @@ -2482,37 +2455,25 @@ "command": "gitlens.openBranchesInRemote", "title": "Open Branches on Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-link.svg", - "light": "images/light/icon-link.svg" - } + "icon": "$(link-external)" }, { "command": "gitlens.openBranchInRemote", "title": "Open Branch on Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-link.svg", - "light": "images/light/icon-link.svg" - } + "icon": "$(link-external)" }, { "command": "gitlens.openCommitInRemote", "title": "Open Commit on Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-link.svg", - "light": "images/light/icon-link.svg" - } + "icon": "$(link-external)" }, { "command": "gitlens.openFileInRemote", "title": "Open File on Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-link.svg", - "light": "images/light/icon-link.svg" - } + "icon": "$(link-external)" }, { "command": "gitlens.openFileRevision", @@ -2528,10 +2489,7 @@ "command": "gitlens.openRepoInRemote", "title": "Open Repository on Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-link.svg", - "light": "images/light/icon-link.svg" - } + "icon": "$(link-external)" }, { "command": "gitlens.openRevisionFile", @@ -2557,10 +2515,7 @@ "command": "gitlens.openWorkingFile", "title": "Open File", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-open-working-file.svg", - "light": "images/light/icon-open-working-file.svg" - } + "icon": "$(go-to-file)" }, { "command": "gitlens.stashApply", @@ -2575,10 +2530,7 @@ "command": "gitlens.stashDelete", "title": "Delete Stash...", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-delete.svg", - "light": "images/light/icon-delete.svg" - } + "icon": "$(trash)" }, { "command": "gitlens.stashSave", @@ -2617,65 +2569,44 @@ "command": "gitlens.inviteToLiveShare", "title": "Invite to Live Share", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-link-color.svg", - "light": "images/light/icon-link-color.svg" - } + "icon": "$(live-share)" }, { "command": "gitlens.exploreRepoAtRevision", "title": "Explore Repository from Revision", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-open-folder.svg", - "light": "images/light/icon-open-folder.svg" - }, + "icon": "$(folder-opened)", "enablement": "gitlens:activeFileStatus =~ /revision/ && resourceScheme != git" }, { "command": "gitlens.views.exploreRepoAtRevision", "title": "Explore Repository from Revision", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-open-folder.svg", - "light": "images/light/icon-open-folder.svg" - } + "icon": "$(folder-opened)" }, { "command": "gitlens.fetchRepositories", "title": "Fetch Repositories", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-sync.svg", - "light": "images/light/icon-sync.svg" - } + "icon": "$(sync)" }, { "command": "gitlens.pullRepositories", "title": "Pull Repositories", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-pull.svg", - "light": "images/light/icon-pull.svg" - } + "icon": "$(arrow-down)" }, { "command": "gitlens.pushRepositories", "title": "Push Repositories", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-push.svg", - "light": "images/light/icon-push.svg" - } + "icon": "$(arrow-up)" }, { "command": "gitlens.views.addRemote", "title": "Add Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-add.svg", - "light": "images/light/icon-add.svg" - } + "icon": "$(add)" }, { "command": "gitlens.views.highlightChanges", @@ -2762,28 +2693,19 @@ "command": "gitlens.views.fetch", "title": "Fetch", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-sync.svg", - "light": "images/light/icon-sync.svg" - } + "icon": "$(sync)" }, { "command": "gitlens.views.pull", "title": "Pull", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-pull.svg", - "light": "images/light/icon-pull.svg" - } + "icon": "$(arrow-down)" }, { "command": "gitlens.views.push", "title": "Push", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-push.svg", - "light": "images/light/icon-push.svg" - } + "icon": "$(arrow-up)" }, { "command": "gitlens.views.pushWithForce", @@ -2813,55 +2735,37 @@ "command": "gitlens.views.stageDirectory", "title": "Stage All Changes", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-add.svg", - "light": "images/light/icon-add.svg" - } + "icon": "$(add)" }, { "command": "gitlens.views.stageFile", "title": "Stage Changes", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-add.svg", - "light": "images/light/icon-add.svg" - } + "icon": "$(add)" }, { "command": "gitlens.views.unstageDirectory", "title": "Unstage All Changes", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-minus.svg", - "light": "images/light/icon-minus.svg" - } + "icon": "$(add)" }, { "command": "gitlens.views.unstageFile", "title": "Unstage Changes", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-minus.svg", - "light": "images/light/icon-minus.svg" - } + "icon": "$(remove)" }, { "command": "gitlens.views.star", "title": "Add to Favorites", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-star.svg", - "light": "images/light/icon-star.svg" - } + "icon": "$(star-empty)" }, { "command": "gitlens.views.unstar", "title": "Remove from Favorites", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-star-filled.svg", - "light": "images/light/icon-star-filled.svg" - } + "icon": "$(star-full)" }, { "command": "gitlens.views.openDirectoryDiff", @@ -2891,28 +2795,22 @@ "command": "gitlens.views.openFile", "title": "Open File", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-open-file.svg", - "light": "images/light/icon-open-file.svg" - } + "icon": "$(go-to-file)" }, { "command": "gitlens.views.openFileRevision", "title": "Open Revision", "category": "GitLens", "icon": { - "dark": "images/dark/icon-open-file.svg", - "light": "images/light/icon-open-file.svg" + "dark": "images/dark/icon-open-revision.svg", + "light": "images/light/icon-open-revision.svg" } }, { "command": "gitlens.views.openFileRevisionInRemote", "title": "Open Revision on Remote", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-link.svg", - "light": "images/light/icon-link.svg" - } + "icon": "$(link-external)" }, { "command": "gitlens.views.openChangedFiles", @@ -2953,10 +2851,7 @@ "command": "gitlens.views.compareWithHead", "title": "Compare with HEAD", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-compare-refs.svg", - "light": "images/light/icon-compare-refs.svg" - } + "icon": "$(compare-changes)" }, { "command": "gitlens.views.compareWithRemote", @@ -3115,10 +3010,7 @@ "command": "gitlens.views.repositories.refresh", "title": "Refresh", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-refresh.svg", - "light": "images/light/icon-refresh.svg" - } + "icon": "$(refresh)" }, { "command": "gitlens.views.repositories.setBranchComparisonToWorking", @@ -3133,37 +3025,25 @@ "command": "gitlens.views.repositories.setBranchComparisonToBranch", "title": "Switch to Branch Comparison", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-compare-refs.svg", - "light": "images/light/icon-compare-refs.svg" - } + "icon": "$(compare-changes)" }, { "command": "gitlens.views.repositories.setBranchesLayoutToList", "title": "Toggle Branch Layout (Tree)", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-tree.svg", - "light": "images/light/icon-view-tree.svg" - } + "icon": "$(list-tree)" }, { "command": "gitlens.views.repositories.setBranchesLayoutToTree", "title": "Toggle Branch Layout (List)", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-list.svg", - "light": "images/light/icon-view-list.svg" - } + "icon": "$(list-flat)" }, { "command": "gitlens.views.repositories.setFilesLayoutToAuto", "title": "Toggle File Layout (Tree)", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-tree.svg", - "light": "images/light/icon-view-tree.svg" - } + "icon": "$(list-tree)" }, { "command": "gitlens.views.repositories.setFilesLayoutToList", @@ -3178,10 +3058,7 @@ "command": "gitlens.views.repositories.setFilesLayoutToTree", "title": "Toggle File Layout (List)", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-list.svg", - "light": "images/light/icon-view-list.svg" - } + "icon": "$(list-flat)" }, { "command": "gitlens.views.repositories.setAutoRefreshToOn", @@ -3197,37 +3074,25 @@ "command": "gitlens.views.fileHistory.refresh", "title": "Refresh", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-refresh.svg", - "light": "images/light/icon-refresh.svg" - } + "icon": "$(refresh)" }, { "command": "gitlens.views.fileHistory.changeBase", "title": "Change Base...", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-history.svg", - "light": "images/light/icon-history.svg" - } + "icon": "$(history)" }, { "command": "gitlens.views.fileHistory.setEditorFollowingOn", "title": "Resume File Tracking", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-location.svg", - "light": "images/light/icon-location.svg" - } + "icon": "$(eye-closed)" }, { "command": "gitlens.views.fileHistory.setEditorFollowingOff", "title": "Pause File Tracking", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-location-filled.svg", - "light": "images/light/icon-location-filled.svg" - } + "icon": "$(eye)" }, { "command": "gitlens.views.fileHistory.setRenameFollowingOn", @@ -3243,37 +3108,25 @@ "command": "gitlens.views.lineHistory.refresh", "title": "Refresh", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-refresh.svg", - "light": "images/light/icon-refresh.svg" - } + "icon": "$(refresh)" }, { "command": "gitlens.views.lineHistory.changeBase", "title": "Change Base...", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-history.svg", - "light": "images/light/icon-history.svg" - } + "icon": "$(history)" }, { "command": "gitlens.views.lineHistory.setEditorFollowingOn", "title": "Resume Line Tracking", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-location.svg", - "light": "images/light/icon-location.svg" - } + "icon": "$(eye-closed)" }, { "command": "gitlens.views.lineHistory.setEditorFollowingOff", "title": "Pause Line Tracking", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-location-filled.svg", - "light": "images/light/icon-location-filled.svg" - } + "icon": "$(eye)" }, { "command": "gitlens.views.lineHistory.setRenameFollowingOn", @@ -3289,37 +3142,25 @@ "command": "gitlens.views.compare.selectForCompare", "title": "Compare References...", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-compare-refs.svg", - "light": "images/light/icon-compare-refs.svg" - } + "icon": "$(compare-changes)" }, { "command": "gitlens.views.compare.clear", "title": "Clear Results", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-clear.svg", - "light": "images/light/icon-clear.svg" - } + "icon": "$(clear-all)" }, { "command": "gitlens.views.compare.refresh", "title": "Refresh", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-refresh.svg", - "light": "images/light/icon-refresh.svg" - } + "icon": "$(refresh)" }, { "command": "gitlens.views.compare.setFilesLayoutToAuto", "title": "Automatic Layout", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-tree.svg", - "light": "images/light/icon-view-tree.svg" - } + "icon": "$(list-tree)" }, { "command": "gitlens.views.compare.setFilesLayoutToList", @@ -3334,28 +3175,19 @@ "command": "gitlens.views.compare.setFilesLayoutToTree", "title": "Tree Layout", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-list.svg", - "light": "images/light/icon-view-list.svg" - } + "icon": "$(list-flat)" }, { "command": "gitlens.views.compare.setKeepResultsToOn", "title": "Keep Results", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-lock.svg", - "light": "images/light/icon-lock.svg" - } + "icon": "$(unlock)" }, { "command": "gitlens.views.compare.setKeepResultsToOff", "title": "Keep Results", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-locked.svg", - "light": "images/light/icon-locked.svg" - } + "icon": "$(lock)" }, { "command": "gitlens.views.compare.pinComparison", @@ -3370,10 +3202,7 @@ "command": "gitlens.views.compare.unpinComparison", "title": "Unpin Comparison", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-unpin.svg", - "light": "images/light/icon-unpin.svg" - } + "icon": "$(pin)" }, { "command": "gitlens.views.compare.swapComparison", @@ -3388,37 +3217,25 @@ "command": "gitlens.views.search.searchCommits", "title": "Search Commits", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-search.svg", - "light": "images/light/icon-search.svg" - } + "icon": "$(search)" }, { "command": "gitlens.views.search.clear", "title": "Clear Results", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-clear.svg", - "light": "images/light/icon-clear.svg" - } + "icon": "$(clear-all)" }, { "command": "gitlens.views.search.refresh", "title": "Refresh", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-refresh.svg", - "light": "images/light/icon-refresh.svg" - } + "icon": "$(refresh)" }, { "command": "gitlens.views.search.setFilesLayoutToAuto", "title": "Automatic Layout", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-tree.svg", - "light": "images/light/icon-view-tree.svg" - } + "icon": "$(list-tree)" }, { "command": "gitlens.views.search.setFilesLayoutToList", @@ -3433,37 +3250,25 @@ "command": "gitlens.views.search.setFilesLayoutToTree", "title": "Tree Layout", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-view-list.svg", - "light": "images/light/icon-view-list.svg" - } + "icon": "$(list-flat)" }, { "command": "gitlens.views.search.setKeepResultsToOn", "title": "Keep Results", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-lock.svg", - "light": "images/light/icon-lock.svg" - } + "icon": "$(unlock)" }, { "command": "gitlens.views.search.setKeepResultsToOff", "title": "Keep Results", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-locked.svg", - "light": "images/light/icon-locked.svg" - } + "icon": "$(lock)" }, { "command": "gitlens.views.dismissNode", "title": "Dismiss", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-close.svg", - "light": "images/light/icon-close.svg" - } + "icon": "$(close)" }, { "command": "gitlens.views.expandNode", @@ -3474,19 +3279,12 @@ "command": "gitlens.views.refreshNode", "title": "Refresh", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-refresh.svg", - "light": "images/light/icon-refresh.svg" - } + "icon": "$(refresh)" }, { "command": "gitlens.views.showMoreChildren", "title": "Load More", - "category": "GitLens", - "icon": { - "dark": "images/dark/icon-unfold.svg", - "light": "images/light/icon-unfold.svg" - } + "category": "GitLens" }, { "command": "gitlens.views.showAllChildren", diff --git a/src/commands/git/branch.ts b/src/commands/git/branch.ts index cd413a6..4206918 100644 --- a/src/commands/git/branch.ts +++ b/src/commands/git/branch.ts @@ -1,6 +1,6 @@ 'use strict'; /* eslint-disable no-loop-func */ -import { QuickInputButton, QuickInputButtons, Uri } from 'vscode'; +import { QuickInputButton, QuickInputButtons, ThemeIcon } from 'vscode'; import { Container } from '../../container'; import { GitBranch, GitReference, Repository } from '../../git/gitService'; import { @@ -75,10 +75,7 @@ export interface BranchGitCommandArgs { export class BranchGitCommand extends QuickCommandBase { private readonly Buttons = class { static readonly RevealInView: QuickInputButton = { - iconPath: { - dark: Uri.file(Container.context.asAbsolutePath('images/dark/icon-eye.svg')), - light: Uri.file(Container.context.asAbsolutePath('images/light/icon-eye.svg')), - }, + iconPath: new ThemeIcon('eye'), tooltip: 'Reveal Branch in Repositories View', }; }; diff --git a/src/commands/git/pull.ts b/src/commands/git/pull.ts index 2dd0959..3ef07d5 100644 --- a/src/commands/git/pull.ts +++ b/src/commands/git/pull.ts @@ -1,5 +1,5 @@ 'use strict'; -import { QuickInputButton, Uri } from 'vscode'; +import { QuickInputButton, ThemeIcon } from 'vscode'; import { Container } from '../../container'; import { Repository } from '../../git/gitService'; import { QuickCommandBase, QuickPickStep, StepAsyncGenerator, StepSelection, StepState } from '../quickCommand'; @@ -25,10 +25,7 @@ export interface PullGitCommandArgs { export class PullGitCommand extends QuickCommandBase { private readonly Buttons = class { static readonly Fetch: QuickInputButton = { - iconPath: { - dark: Uri.file(Container.context.asAbsolutePath('images/dark/icon-sync.svg')), - light: Uri.file(Container.context.asAbsolutePath('images/light/icon-sync.svg')), - }, + iconPath: new ThemeIcon('sync'), tooltip: 'Fetch', }; }; diff --git a/src/commands/git/search.ts b/src/commands/git/search.ts index 724d171..8304b66 100644 --- a/src/commands/git/search.ts +++ b/src/commands/git/search.ts @@ -1,6 +1,6 @@ 'use strict'; /* eslint-disable no-loop-func */ -import { QuickInputButton, Uri } from 'vscode'; +import { QuickInputButton, ThemeIcon, Uri } from 'vscode'; import { Container } from '../../container'; import { GitLog, @@ -77,10 +77,7 @@ export class SearchGitCommand extends QuickCommandBase { }; static readonly RevealInView: QuickInputButton = { - iconPath: { - dark: Uri.file(Container.context.asAbsolutePath('images/dark/icon-eye.svg')), - light: Uri.file(Container.context.asAbsolutePath('images/light/icon-eye.svg')), - }, + iconPath: new ThemeIcon('eye'), tooltip: 'Reveal Commit in Repositories View', }; diff --git a/src/commands/git/stash.ts b/src/commands/git/stash.ts index c88cf92..066a5da 100644 --- a/src/commands/git/stash.ts +++ b/src/commands/git/stash.ts @@ -1,6 +1,6 @@ 'use strict'; /* eslint-disable no-loop-func */ -import { QuickInputButton, QuickInputButtons, QuickPickItem, Uri, window } from 'vscode'; +import { QuickInputButton, QuickInputButtons, QuickPickItem, ThemeIcon, Uri, window } from 'vscode'; import { Container } from '../../container'; import { GitStashCommit, GitUri, Repository } from '../../git/gitService'; import { @@ -83,10 +83,7 @@ export interface StashGitCommandArgs { export class StashGitCommand extends QuickCommandBase { private readonly Buttons = class { static readonly RevealInView: QuickInputButton = { - iconPath: { - dark: Uri.file(Container.context.asAbsolutePath('images/dark/icon-eye.svg')), - light: Uri.file(Container.context.asAbsolutePath('images/light/icon-eye.svg')), - }, + iconPath: new ThemeIcon('eye'), tooltip: 'Reveal Stash in Repositories View', }; }; diff --git a/src/commands/git/tag.ts b/src/commands/git/tag.ts index d6b777b..7b414ee 100644 --- a/src/commands/git/tag.ts +++ b/src/commands/git/tag.ts @@ -1,6 +1,6 @@ 'use strict'; /* eslint-disable no-loop-func */ -import { QuickInputButton, QuickInputButtons, Uri } from 'vscode'; +import { QuickInputButton, QuickInputButtons, ThemeIcon } from 'vscode'; import { Container } from '../../container'; import { GitReference, GitTag, Repository } from '../../git/gitService'; import { @@ -64,10 +64,7 @@ export interface TagGitCommandArgs { export class TagGitCommand extends QuickCommandBase { private readonly Buttons = class { static readonly RevealInView: QuickInputButton = { - iconPath: { - dark: Uri.file(Container.context.asAbsolutePath('images/dark/icon-eye.svg')), - light: Uri.file(Container.context.asAbsolutePath('images/light/icon-eye.svg')), - }, + iconPath: new ThemeIcon('eye'), tooltip: 'Reveal Tag in Repositories View', }; }; diff --git a/src/git/remotes/github.ts b/src/git/remotes/github.ts index fecae95..b779407 100644 --- a/src/git/remotes/github.ts +++ b/src/git/remotes/github.ts @@ -1,5 +1,5 @@ 'use strict'; -import { Disposable, env, QuickInputButton, Range, Uri, window } from 'vscode'; +import { Disposable, env, QuickInputButton, Range, ThemeIcon, Uri, window } from 'vscode'; import { DynamicAutolinkReference } from '../../annotations/autolinks'; import { AutolinkReference } from '../../config'; import { Container } from '../../container'; @@ -12,10 +12,7 @@ const issueEnricher3rdParyRegex = /\b(\w+\\?-?\w+(?!\\?-)\/\w+\\?-?\w+(?!\\?-))\ export class GitHubRemote extends RemoteProviderWithApi<{ token: string }> { private readonly Buttons = class { static readonly Help: QuickInputButton = { - iconPath: { - dark: Uri.file(Container.context.asAbsolutePath('images/dark/icon-help.svg')), - light: Uri.file(Container.context.asAbsolutePath('images/light/icon-help.svg')), - }, + iconPath: new ThemeIcon('question'), tooltip: 'Help', }; }; diff --git a/src/views/nodes/branchTrackingStatusNode.ts b/src/views/nodes/branchTrackingStatusNode.ts index 71292c4..86d2c3c 100644 --- a/src/views/nodes/branchTrackingStatusNode.ts +++ b/src/views/nodes/branchTrackingStatusNode.ts @@ -1,5 +1,5 @@ 'use strict'; -import { TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { Container } from '../../container'; import { GitBranch, GitLog, GitRevision, GitTrackingState, GitUri } from '../../git/gitService'; import { debug, gate, Iterables, Strings } from '../../system'; @@ -111,14 +111,8 @@ export class BranchTrackingStatusNode extends ViewNode implements ? ResourceType.BranchStatusAheadOfUpstream : ResourceType.BranchStatusBehindUpstream; } + item.iconPath = new ThemeIcon(ahead ? 'cloud-upload' : 'cloud-download'); item.tooltip = `${label}${ahead ? ' of ' : ''}${this.status.upstream}`; - - const iconSuffix = ahead ? 'upload' : 'download'; - item.iconPath = { - dark: Container.context.asAbsolutePath(`images/dark/icon-${iconSuffix}.svg`), - light: Container.context.asAbsolutePath(`images/light/icon-${iconSuffix}.svg`), - }; - return item; } diff --git a/src/views/nodes/commitNode.ts b/src/views/nodes/commitNode.ts index 3ef7a1b..12d9825 100644 --- a/src/views/nodes/commitNode.ts +++ b/src/views/nodes/commitNode.ts @@ -1,6 +1,6 @@ 'use strict'; import * as paths from 'path'; -import { Command, TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { Command, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { Commands, DiffWithPreviousCommandArgs } from '../../commands'; import { ViewFilesLayout } from '../../configuration'; import { GlyphChars } from '../../constants'; @@ -75,16 +75,9 @@ export class CommitNode extends ViewRefNode { truncateMessageAtNewLine: true, dateFormat: Container.config.defaultDateFormat, }); - - if (this.view.config.avatars) { - item.iconPath = this.commit.getGravatarUri(Container.config.defaultGravatarsStyle); - } else { - item.iconPath = { - dark: Container.context.asAbsolutePath('images/dark/icon-commit.svg'), - light: Container.context.asAbsolutePath('images/light/icon-commit.svg'), - }; - } - + item.iconPath = this.view.config.avatars + ? this.commit.getGravatarUri(Container.config.defaultGravatarsStyle) + : new ThemeIcon('git-commit'); item.tooltip = CommitFormatter.fromTemplate( this.commit.isUncommitted ? `\${author} ${GlyphChars.Dash} \${id}\n\${ago} (\${date})` diff --git a/src/views/nodes/compareBranchNode.ts b/src/views/nodes/compareBranchNode.ts index f85d21b..9fd66fb 100644 --- a/src/views/nodes/compareBranchNode.ts +++ b/src/views/nodes/compareBranchNode.ts @@ -1,5 +1,5 @@ 'use strict'; -import { TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { BranchComparison, BranchComparisons, GlyphChars, WorkspaceState } from '../../constants'; import { ResourceType, ViewNode } from './viewNode'; import { RepositoriesView } from '../repositoriesView'; @@ -109,14 +109,14 @@ export class CompareBranchNode extends ViewNode { this.comparisonNotation === '..' ? 'twodot' : 'threedot' }+${this.comparisonType}`; item.description = description; - item.iconPath = { - dark: Container.context.asAbsolutePath( - `images/dark/icon-compare-${this.compareWithWorkingTree ? 'ref-working' : 'refs'}.svg`, - ), - light: Container.context.asAbsolutePath( - `images/light/icon-compare-${this.compareWithWorkingTree ? 'ref-working' : 'refs'}.svg`, - ), - }; + if (this.compareWithWorkingTree) { + item.iconPath = { + dark: Container.context.asAbsolutePath('images/dark/icon-compare-ref-working.svg'), + light: Container.context.asAbsolutePath('images/light/icon-compare-ref-working.svg'), + }; + } else { + item.iconPath = new ThemeIcon('git-compare'); + } item.id = this.id; item.tooltip = `Click to compare ${this.branch.name}${this.compareWithWorkingTree ? ' (working)' : ''} with${ GlyphChars.Ellipsis diff --git a/src/views/nodes/contributorsNode.ts b/src/views/nodes/contributorsNode.ts index 130512c..ccc008b 100644 --- a/src/views/nodes/contributorsNode.ts +++ b/src/views/nodes/contributorsNode.ts @@ -1,5 +1,5 @@ 'use strict'; -import { TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { GitContributor, GitUri, Repository } from '../../git/gitService'; import { RepositoriesView } from '../repositoriesView'; import { MessageNode } from './common'; @@ -38,12 +38,7 @@ export class ContributorsNode extends ViewNode { const item = new TreeItem('Contributors', TreeItemCollapsibleState.Collapsed); item.id = this.id; item.contextValue = ResourceType.Contributors; - - item.iconPath = { - dark: Container.context.asAbsolutePath('images/dark/icon-people.svg'), - light: Container.context.asAbsolutePath('images/light/icon-people.svg'), - }; - + item.iconPath = new ThemeIcon('organization'); return item; } diff --git a/src/views/nodes/fileHistoryNode.ts b/src/views/nodes/fileHistoryNode.ts index c7bd84d..062ce59 100644 --- a/src/views/nodes/fileHistoryNode.ts +++ b/src/views/nodes/fileHistoryNode.ts @@ -1,5 +1,5 @@ 'use strict'; -import { Disposable, TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { Disposable, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { Container } from '../../container'; import { GitCommitType, @@ -162,15 +162,11 @@ export class FileHistoryNode extends SubscribeableViewNode implements PageableVi ); item.contextValue = ResourceType.FileHistory; item.description = this.uri.directory; + item.iconPath = new ThemeIcon('history'); item.tooltip = `History of ${this.uri.fileName}\n${this.uri.directory}/${ this.uri.sha === undefined ? '' : `\n\n${this.uri.sha}` }`; - item.iconPath = { - dark: Container.context.asAbsolutePath('images/dark/icon-history.svg'), - light: Container.context.asAbsolutePath('images/light/icon-history.svg'), - }; - void this.ensureSubscription(); return item; diff --git a/src/views/nodes/lineHistoryNode.ts b/src/views/nodes/lineHistoryNode.ts index 0554679..d4dc42a 100644 --- a/src/views/nodes/lineHistoryNode.ts +++ b/src/views/nodes/lineHistoryNode.ts @@ -1,5 +1,5 @@ 'use strict'; -import { Disposable, Selection, TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { Disposable, Selection, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { Container } from '../../container'; import { GitCommitType, GitFile, GitLogCommit } from '../../git/git'; import { @@ -218,15 +218,11 @@ export class LineHistoryNode extends SubscribeableViewNode implements PageableVi ); item.contextValue = ResourceType.LineHistory; item.description = this.uri.directory; + item.iconPath = new ThemeIcon('history'); item.tooltip = `History of ${this.uri.fileName}${lines}\n${this.uri.directory}/${ this.uri.sha === undefined ? '' : `\n\n${this.uri.sha}` }`; - item.iconPath = { - dark: Container.context.asAbsolutePath('images/dark/icon-history.svg'), - light: Container.context.asAbsolutePath('images/light/icon-history.svg'), - }; - void this.ensureSubscription(); return item; diff --git a/src/views/nodes/tagsNode.ts b/src/views/nodes/tagsNode.ts index f0da66a..aad531e 100644 --- a/src/views/nodes/tagsNode.ts +++ b/src/views/nodes/tagsNode.ts @@ -1,7 +1,6 @@ 'use strict'; -import { TreeItem, TreeItemCollapsibleState } from 'vscode'; +import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; import { ViewBranchesLayout } from '../../configuration'; -import { Container } from '../../container'; import { GitUri, Repository } from '../../git/gitService'; import { Arrays } from '../../system'; import { RepositoriesView } from '../repositoriesView'; @@ -57,12 +56,7 @@ export class TagsNode extends ViewNode { const item = new TreeItem('Tags', TreeItemCollapsibleState.Collapsed); item.id = this.id; item.contextValue = ResourceType.Tags; - - item.iconPath = { - dark: Container.context.asAbsolutePath('images/dark/icon-tag.svg'), - light: Container.context.asAbsolutePath('images/light/icon-tag.svg'), - }; - + item.iconPath = new ThemeIcon('tag'); return item; } }