From 444296988b8fc5c10e9eef1b04655c2c6e566035 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Mon, 12 Jun 2023 19:43:04 -0400
Subject: [PATCH] Adds workspaces icon

---
 images/icons/template/mapping.json                 | 3 ++-
 images/icons/workspaces-view.svg                   | 1 +
 package.json                                       | 9 ++++++++-
 src/webviews/apps/commitDetails/commitDetails.html | 2 +-
 src/webviews/apps/home/home.html                   | 2 +-
 src/webviews/apps/plus/focus/focus.html            | 2 +-
 src/webviews/apps/plus/graph/graph.html            | 2 +-
 src/webviews/apps/plus/timeline/timeline.html      | 2 +-
 src/webviews/apps/shared/components/code-icon.ts   | 3 +++
 src/webviews/apps/shared/glicons.scss              | 5 ++++-
 src/webviews/apps/welcome/welcome.html             | 6 +++---
 11 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 images/icons/workspaces-view.svg

diff --git a/images/icons/template/mapping.json b/images/icons/template/mapping.json
index 526eb59..de968a4 100644
--- a/images/icons/template/mapping.json
+++ b/images/icons/template/mapping.json
@@ -36,5 +36,6 @@
   "provider-gitea": 61729,
   "provider-github": 61730,
   "provider-gitlab": 61731,
-  "gitlens-inspect": 61732
+  "gitlens-inspect": 61732,
+  "workspaces-view": 61733
 }
\ No newline at end of file
diff --git a/images/icons/workspaces-view.svg b/images/icons/workspaces-view.svg
new file mode 100644
index 0000000..15613ab
--- /dev/null
+++ b/images/icons/workspaces-view.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M11.685 17.25a5.25 5.25 0 1 0 0-10.5 5.25 5.25 0 0 0 0 10.5ZM20.264 8.593a3.669 3.669 0 1 0 0-7.337 3.669 3.669 0 0 0 0 7.337Z"/><path d="M1.293 12a10.395 10.395 0 0 1 19.624-4.78l1.086-.563a11.616 11.616 0 1 0 1.3 5.343c0-1.268-.203-2.67-.58-3.815 0 0-.26.237-.547.36a4.362 4.362 0 0 1-.615.204A10.395 10.395 0 1 1 1.293 12Z"/></svg>
diff --git a/package.json b/package.json
index 88210cd..01d1434 100644
--- a/package.json
+++ b/package.json
@@ -7812,6 +7812,13 @@
 					"fontPath": "dist/glicons.woff2",
 					"fontCharacter": "\\f124"
 				}
+			},
+			"gitlens-workspaces-view": {
+				"description": "workspaces-view icon",
+				"default": {
+					"fontPath": "dist/glicons.woff2",
+					"fontCharacter": "\\f125"
+				}
 			}
 		},
 		"menus": {
@@ -14187,7 +14194,7 @@
 					"name": "GitKraken Workspaces",
 					"when": "!gitlens:untrusted && !gitlens:hasVirtualFolders",
 					"contextualTitle": "GitLens",
-					"icon": "$(gitlens-worktrees-view)",
+					"icon": "$(gitlens-workspaces-view)",
 					"initialSize": 2,
 					"visibility": "visible"
 				},
diff --git a/src/webviews/apps/commitDetails/commitDetails.html b/src/webviews/apps/commitDetails/commitDetails.html
index 6b826cc..022b9a1 100644
--- a/src/webviews/apps/commitDetails/commitDetails.html
+++ b/src/webviews/apps/commitDetails/commitDetails.html
@@ -11,7 +11,7 @@
 			@font-face {
 				font-family: 'glicons';
 				font-display: block;
-				src: url('#{root}/dist/glicons.woff2?ab6c9110fb0444acd9ba719c4c55fa68') format('woff2');
+				src: url('#{root}/dist/glicons.woff2?8e33f5a80a91b05940d687a08305c156') format('woff2');
 			}
 		</style>
 	</head>
diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html
index dcd5b87..e54f3a0 100644
--- a/src/webviews/apps/home/home.html
+++ b/src/webviews/apps/home/home.html
@@ -11,7 +11,7 @@
 			@font-face {
 				font-family: 'glicons';
 				font-display: block;
-				src: url('#{root}/dist/glicons.woff2?ab6c9110fb0444acd9ba719c4c55fa68') format('woff2');
+				src: url('#{root}/dist/glicons.woff2?8e33f5a80a91b05940d687a08305c156') format('woff2');
 			}
 		</style>
 	</head>
diff --git a/src/webviews/apps/plus/focus/focus.html b/src/webviews/apps/plus/focus/focus.html
index 2e4c0c8..6aa2252 100644
--- a/src/webviews/apps/plus/focus/focus.html
+++ b/src/webviews/apps/plus/focus/focus.html
@@ -11,7 +11,7 @@
 			@font-face {
 				font-family: 'glicons';
 				font-display: block;
-				src: url('#{root}/dist/glicons.woff2?ab6c9110fb0444acd9ba719c4c55fa68') format('woff2');
+				src: url('#{root}/dist/glicons.woff2?8e33f5a80a91b05940d687a08305c156') format('woff2');
 			}
 
 			:root {
diff --git a/src/webviews/apps/plus/graph/graph.html b/src/webviews/apps/plus/graph/graph.html
index 3336c36..1c43b24 100644
--- a/src/webviews/apps/plus/graph/graph.html
+++ b/src/webviews/apps/plus/graph/graph.html
@@ -11,7 +11,7 @@
 			@font-face {
 				font-family: 'glicons';
 				font-display: block;
-				src: url('#{root}/dist/glicons.woff2?ab6c9110fb0444acd9ba719c4c55fa68') format('woff2');
+				src: url('#{root}/dist/glicons.woff2?8e33f5a80a91b05940d687a08305c156') format('woff2');
 			}
 		</style>
 		<script type="application/javascript" nonce="#{cspNonce}">
diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html
index d3cc69a..d44bc78 100644
--- a/src/webviews/apps/plus/timeline/timeline.html
+++ b/src/webviews/apps/plus/timeline/timeline.html
@@ -11,7 +11,7 @@
 			@font-face {
 				font-family: 'glicons';
 				font-display: block;
-				src: url('#{root}/dist/glicons.woff2?ab6c9110fb0444acd9ba719c4c55fa68') format('woff2');
+				src: url('#{root}/dist/glicons.woff2?8e33f5a80a91b05940d687a08305c156') format('woff2');
 			}
 		</style>
 	</head>
diff --git a/src/webviews/apps/shared/components/code-icon.ts b/src/webviews/apps/shared/components/code-icon.ts
index f469001..22c4c6e 100644
--- a/src/webviews/apps/shared/components/code-icon.ts
+++ b/src/webviews/apps/shared/components/code-icon.ts
@@ -1608,6 +1608,9 @@ export class CodeIcon extends LitElement {
 		:host([icon='gl-gitlens-inspect']):before {
 			content: '\\f124';
 		}
+		:host([icon='gl-workspaces-view']):before {
+			content: '\\f125';
+		}
 
 		@keyframes codicon-spin {
 			100% {
diff --git a/src/webviews/apps/shared/glicons.scss b/src/webviews/apps/shared/glicons.scss
index 8ed05f5..f4c641d 100644
--- a/src/webviews/apps/shared/glicons.scss
+++ b/src/webviews/apps/shared/glicons.scss
@@ -6,7 +6,7 @@ Must be placed at the end of body in the HTML file of any webview that needs it
 	@font-face {
 		font-family: 'glicons';
 		font-display: block;
-		src: url("#{root}/dist/glicons.woff2?ab6c9110fb0444acd9ba719c4c55fa68") format("woff2");
+		src: url("#{root}/dist/glicons.woff2?8e33f5a80a91b05940d687a08305c156") format("woff2");
 	}
 </style>
 */
@@ -173,3 +173,6 @@ Must be placed at the end of body in the HTML file of any webview that needs it
 .glicon-gitlens-inspect:before {
 	content: '\f124';
 }
+.glicon-workspaces-view:before {
+	content: '\f125';
+}
diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html
index f2f2f66..dab5cf9 100644
--- a/src/webviews/apps/welcome/welcome.html
+++ b/src/webviews/apps/welcome/welcome.html
@@ -11,7 +11,7 @@
 			@font-face {
 				font-family: 'glicons';
 				font-display: block;
-				src: url('#{root}/dist/glicons.woff2?ab6c9110fb0444acd9ba719c4c55fa68') format('woff2');
+				src: url('#{root}/dist/glicons.woff2?8e33f5a80a91b05940d687a08305c156') format('woff2');
 			}
 		</style>
 	</head>
@@ -224,7 +224,7 @@
 						data-requires="repo"
 						title="Show Workspaces view"
 						aria-label="Show Workspaces view"
-						><code-icon icon="gl-worktrees-view" size="20"></code-icon>Workspaces ☁️</a
+						><code-icon icon="gl-workspaces-view" size="20"></code-icon>Workspaces ☁️</a
 					>
 				</nav>
 				<p data-requires="norepo">
@@ -448,7 +448,7 @@
 						data-requires="repo"
 						title="Show Workspaces view"
 						aria-label="Show Workspaces view"
-						><code-icon icon="gl-worktrees-view" size="20"></code-icon>Workspaces ☁️</a
+						><code-icon icon="gl-workspaces-view"></code-icon>Workspaces ☁️</a
 					>
 					<a
 						href="command:gitlens.showWorktreesView"