From 566325170863f5acd2d9ba04c34a855e1bff44d8 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sun, 24 Jan 2021 16:32:47 -0500
Subject: [PATCH] Adds new icon for create pull request

---
 images/dark/icon-create-pull-request.svg  |  5 +++++
 images/light/icon-create-pull-request.svg |  5 +++++
 package.json                              | 29 ++++++++++++++++-------------
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 images/dark/icon-create-pull-request.svg
 create mode 100644 images/light/icon-create-pull-request.svg

diff --git a/images/dark/icon-create-pull-request.svg b/images/dark/icon-create-pull-request.svg
new file mode 100644
index 0000000..d5d9697
--- /dev/null
+++ b/images/dark/icon-create-pull-request.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16">
+	<path fill="#C5C5C5" fill-rule="evenodd" clip-rule="evenodd" d="M13.039 7V5.485a2.493 2.493 0 00-2.5-2.503h-1.85l1.27-1.271L9.249 1l-2.13 2.132v.701l2.13 2.133.71-.711-1.27-1.272h1.85a1.5 1.5 0 011.5 1.502V7h1z"/>
+	<path fill="#C5C5C5" d="M12 16h1v-3h3v-1h-3V9h-1v3H9v1h3v3z"/>
+	<path fill="#C5C5C5" fill-rule="evenodd" clip-rule="evenodd" d="M4.015 5.994s.31-.079.457-.14c.452-.19.839-.511 1.11-.923.273-.41.418-.894.417-1.389a2.47 2.47 0 00-.188-1A2.484 2.484 0 004.47 1.19 2.413 2.413 0 003.48 1c-.49 0-.97.145-1.377.42a2.497 2.497 0 00-1.054 2.568c.095.486.33.932.675 1.284.348.343.785.579 1.26.68v5.093a2.562 2.562 0 00-1.26.68 2.542 2.542 0 00-.536 2.732c.189.457.507.847.915 1.121.408.274.887.42 1.377.42.34.008.679-.057.992-.19a2.46 2.46 0 001.34-1.35 2.47 2.47 0 00.188-1.001c0-.495-.144-.978-.416-1.39a2.485 2.485 0 00-1.568-1.062V5.994zm-1.32-1.251a1.48 1.48 0 002.136-.541 1.511 1.511 0 00-.746-2.1 1.467 1.467 0 00-.854-.08c-.29.056-.556.198-.764.409-.209.21-.35.479-.406.77-.059.29-.031.589.079.861.116.277.309.513.556.68zm0 7.514a1.48 1.48 0 012.136.541 1.512 1.512 0 01-.746 2.1c-.27.112-.568.14-.854.08-.29-.056-.556-.198-.764-.409a1.495 1.495 0 01-.406-.77 1.503 1.503 0 01.079-.861c.116-.277.309-.513.556-.68z"/>
+</svg>
diff --git a/images/light/icon-create-pull-request.svg b/images/light/icon-create-pull-request.svg
new file mode 100644
index 0000000..5b9b60a
--- /dev/null
+++ b/images/light/icon-create-pull-request.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16">
+	<path fill="#424242" fill-rule="evenodd" clip-rule="evenodd" d="M13.039 7V5.485a2.493 2.493 0 00-2.5-2.503h-1.85l1.27-1.271L9.249 1l-2.13 2.132v.701l2.13 2.133.71-.711-1.27-1.272h1.85a1.5 1.5 0 011.5 1.502V7h1z"/>
+	<path fill="#424242" d="M12 16h1v-3h3v-1h-3V9h-1v3H9v1h3v3z"/>
+	<path fill="#424242" fill-rule="evenodd" clip-rule="evenodd" d="M4.015 5.994s.31-.079.457-.14c.452-.19.839-.511 1.11-.923.273-.41.418-.894.417-1.389a2.47 2.47 0 00-.188-1A2.484 2.484 0 004.47 1.19 2.413 2.413 0 003.48 1c-.49 0-.97.145-1.377.42a2.497 2.497 0 00-1.054 2.568c.095.486.33.932.675 1.284.348.343.785.579 1.26.68v5.093a2.562 2.562 0 00-1.26.68 2.542 2.542 0 00-.536 2.732c.189.457.507.847.915 1.121.408.274.887.42 1.377.42.34.008.679-.057.992-.19a2.46 2.46 0 001.34-1.35 2.47 2.47 0 00.188-1.001c0-.495-.144-.978-.416-1.39a2.485 2.485 0 00-1.568-1.062V5.994zm-1.32-1.251a1.48 1.48 0 002.136-.541 1.511 1.511 0 00-.746-2.1 1.467 1.467 0 00-.854-.08c-.29.056-.556.198-.764.409-.209.21-.35.479-.406.77-.059.29-.031.589.079.861.116.277.309.513.556.68zm0 7.514a1.48 1.48 0 012.136.541 1.512 1.512 0 01-.746 2.1c-.27.112-.568.14-.854.08-.29-.056-.556-.198-.764-.409a1.495 1.495 0 01-.406-.77 1.503 1.503 0 01.079-.861c.116-.277.309-.513.556-.68z"/>
+</svg>
diff --git a/package.json b/package.json
index 451efa4..7807159 100644
--- a/package.json
+++ b/package.json
@@ -3993,9 +3993,12 @@
 			},
 			{
 				"command": "gitlens.views.createPullRequest",
-				"title": "Create Pull Request",
+				"title": "Create Pull Request...",
 				"category": "GitLens",
-				"icon": "$(git-pull-request)"
+				"icon": {
+					"dark": "images/dark/icon-create-pull-request.svg",
+					"light": "images/light/icon-create-pull-request.svg"
+				}
 			},
 			{
 				"command": "gitlens.views.openPullRequest",
@@ -7196,24 +7199,29 @@
 					"group": "1_gitlens_actions@4"
 				},
 				{
-					"command": "gitlens.views.deleteBranch",
-					"when": "!gitlens:readonly && viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/",
+					"command": "gitlens.views.renameBranch",
+					"when": "!gitlens:readonly && viewItem =~ /gitlens:branch\\b/",
 					"group": "1_gitlens_actions@5"
 				},
 				{
-					"command": "gitlens.views.renameBranch",
-					"when": "!gitlens:readonly && viewItem =~ /gitlens:branch\\b/",
+					"command": "gitlens.views.deleteBranch",
+					"when": "!gitlens:readonly && viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/",
 					"group": "1_gitlens_actions@6"
 				},
 				{
 					"command": "gitlens.views.createBranch",
 					"when": "!gitlens:readonly && viewItem =~ /gitlens:branch\\b/",
-					"group": "1_gitlens_actions@7"
+					"group": "1_gitlens_actions_@7"
 				},
 				{
 					"command": "gitlens.views.createTag",
 					"when": "!gitlens:readonly && viewItem =~ /gitlens:branch\\b/",
-					"group": "1_gitlens_actions@8"
+					"group": "1_gitlens_actions_@8"
+				},
+				{
+					"command": "gitlens.views.createPullRequest",
+					"when": "gitlens:action:createPullRequest && viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(tracking|remote)\\b)/",
+					"group": "1_gitlens_actions_@9"
 				},
 				{
 					"command": "gitlens.openBranchOnRemote",
@@ -7222,11 +7230,6 @@
 					"alt": "gitlens.copyRemoteBranchUrl"
 				},
 				{
-					"command": "gitlens.views.createPullRequest",
-					"when": "gitlens:action:createPullRequest && viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(tracking|remote)\\b)/",
-					"group": "2_gitlens_quickopen@2"
-				},
-				{
 					"command": "gitlens.views.openDirectoryDiffWithWorking",
 					"when": "viewItem =~ /gitlens:(branch|tag)\\b/",
 					"group": "3_gitlens_explore@2"