From ed5c898f27674196ca6f232e1f4846c85753236b Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sat, 29 Sep 2018 14:12:59 -0400
Subject: [PATCH] Adds apply changes to stash toolbar Updates stash icons

---
 images/dark/icon-stash-pop.svg   | 6 +++---
 images/dark/icon-stash-save.svg  | 6 +++---
 images/light/icon-stash-pop.svg  | 6 +++---
 images/light/icon-stash-save.svg | 6 +++---
 package.json                     | 5 +++++
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/images/dark/icon-stash-pop.svg b/images/dark/icon-stash-pop.svg
index fa16ee2..e014d0a 100644
--- a/images/dark/icon-stash-pop.svg
+++ b/images/dark/icon-stash-pop.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
-    <path fill="#C5C5C5" d="m11.4275,7.38941l-6.73,0l3.36459,-5.82741l3.36542,5.82741z"/>
-    <path fill="#C5C5C5" d="m8.9745,4.945l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
-    <path fill="#C5C5C5" d="m14.687501,11.955358l-1.079554,-6.821251c-0.076429,-0.458572 -0.477679,-0.821607 -0.955357,-0.821607l-9.30518,0c-0.477679,0 -0.878929,0.363036 -0.955357,0.821607l-1.079554,6.821251l0,4.776787c0,0.525447 0.429911,0.955357 0.955357,0.955357l11.464288,0c0.525447,0 0.955357,-0.429911 0.955357,-0.955357l0,-4.776787l0,0zm-3.133572,0.525447l-0.420357,0.850268c-0.162411,0.324821 -0.496786,0.535 -0.869375,0.535l-4.547501,0c-0.363036,0 -0.687857,-0.210179 -0.850268,-0.525447l-0.420357,-0.869375c-0.162411,-0.315268 -0.496786,-0.525447 -0.850268,-0.525447l-1.327947,0l0.955357,-6.687501l9.553573,0l0.955357,6.687501l-1.318393,0c-0.372589,0 -0.697411,0.210179 -0.869375,0.525447l0.009554,0.009554z"/>
+    <path fill="#C5C5C5" d="m11.364995,7.38941l-6.73,0l3.36459,-5.82741l3.36542,5.82741l-0.00001,0z"/>
+    <path fill="#C5C5C5" d="m8.974,4.945l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
+    <path fill="#C5C5C5" d="M 10.5 5.258 L 5.5 5.258 L 10.5 5.258 Z M 6.046 4.313 L 9.954 4.313 L 6.046 4.313 Z M 13.608 5.134 C 13.532 4.676 13.13 4.313 12.653 4.313 L 9.954 4.313 L 10.5 5.258 L 12.777 5.258 L 13.732 11.946 L 12.414 11.946 C 12.041 11.946 11.716 12.156 11.544 12.471 L 11.554 12.481 L 11.134 13.331 C 10.971 13.656 10.637 13.866 10.264 13.866 L 5.717 13.866 C 5.354 13.866 5.029 13.656 4.866 13.341 L 4.446 12.471 C 4.284 12.156 3.949 11.946 3.596 11.946 L 2.268 11.946 L 3.223 5.258 L 5.5 5.258 L 6.046 4.313 L 3.347 4.313 C 2.87 4.313 2.468 4.676 2.392 5.134 L 1.312 11.955 L 1.312 16.732 C 1.312 17.258 1.742 17.688 2.268 17.688 L 13.732 17.688 C 14.258 17.688 14.688 17.258 14.688 16.732 L 14.688 11.955 L 13.608 5.134 Z"/>
 </svg>
diff --git a/images/dark/icon-stash-save.svg b/images/dark/icon-stash-save.svg
index 32c6755..8fa5f1b 100644
--- a/images/dark/icon-stash-save.svg
+++ b/images/dark/icon-stash-save.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
-    <path fill="#C5C5C5" d="m4.6975,6.8745l6.73,0l-3.36459,5.82741l-3.36542,-5.82741z"/>
-    <path fill="#C5C5C5" d="m8.9745,1.5075l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
-    <path fill="#C5C5C5" d="m14.687501,11.955358l-1.079554,-6.821251c-0.076429,-0.458572 -0.477679,-0.821607 -0.955357,-0.821607l-9.30518,0c-0.477679,0 -0.878929,0.363036 -0.955357,0.821607l-1.079554,6.821251l0,4.776787c0,0.525447 0.429911,0.955357 0.955357,0.955357l11.464288,0c0.525447,0 0.955357,-0.429911 0.955357,-0.955357l0,-4.776787l0,0zm-3.133572,0.525447l-0.420357,0.850268c-0.162411,0.324821 -0.496786,0.535 -0.869375,0.535l-4.547501,0c-0.363036,0 -0.687857,-0.210179 -0.850268,-0.525447l-0.420357,-0.869375c-0.162411,-0.315268 -0.496786,-0.525447 -0.850268,-0.525447l-1.327947,0l0.955357,-6.687501l9.553573,0l0.955357,6.687501l-1.318393,0c-0.372589,0 -0.697411,0.210179 -0.869375,0.525447l0.009554,0.009554z"/>
+    <path fill="#C5C5C5" d="m4.635005,6.8745l6.73,0l-3.36459,5.82741l-3.36542,-5.82741l0.00001,0z"/>
+    <path fill="#C5C5C5" d="m8.974,1.5075l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
+    <path fill="#C5C5C5" d="m6.5,4.313l3,0l-3,0zm3,0.945l-3,0l3,0zm4.108,-0.124c-0.076,-0.458 -0.478,-0.821 -0.955,-0.821l-3.153,0l0,0.945l3.277,0l0.955,6.688l-1.318,0c-0.373,0 -0.698,0.21 -0.87,0.525l0.01,0.01l-0.42,0.85c-0.163,0.325 -0.497,0.535 -0.87,0.535l-4.547,0c-0.363,0 -0.688,-0.21 -0.851,-0.525l-0.42,-0.87c-0.162,-0.315 -0.497,-0.525 -0.85,-0.525l-1.328,0l0.955,-6.688l3.277,0l0,-0.945l-3.153,0c-0.477,0 -0.879,0.363 -0.955,0.821l-1.08,6.821l0,4.777c0,0.526 0.43,0.956 0.956,0.956l11.464,0c0.526,0 0.956,-0.43 0.956,-0.956l0,-4.777l-1.08,-6.821z"/>
 </svg>
diff --git a/images/light/icon-stash-pop.svg b/images/light/icon-stash-pop.svg
index c3944a8..bd531e0 100644
--- a/images/light/icon-stash-pop.svg
+++ b/images/light/icon-stash-pop.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
-    <path fill="#424242" d="m11.4275,7.38941l-6.73,0l3.36459,-5.82741l3.36542,5.82741z"/>
-    <path fill="#424242" d="m8.9745,4.945l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
-    <path fill="#424242" d="m14.687501,11.955358l-1.079554,-6.821251c-0.076429,-0.458572 -0.477679,-0.821607 -0.955357,-0.821607l-9.30518,0c-0.477679,0 -0.878929,0.363036 -0.955357,0.821607l-1.079554,6.821251l0,4.776787c0,0.525447 0.429911,0.955357 0.955357,0.955357l11.464288,0c0.525447,0 0.955357,-0.429911 0.955357,-0.955357l0,-4.776787l0,0zm-3.133572,0.525447l-0.420357,0.850268c-0.162411,0.324821 -0.496786,0.535 -0.869375,0.535l-4.547501,0c-0.363036,0 -0.687857,-0.210179 -0.850268,-0.525447l-0.420357,-0.869375c-0.162411,-0.315268 -0.496786,-0.525447 -0.850268,-0.525447l-1.327947,0l0.955357,-6.687501l9.553573,0l0.955357,6.687501l-1.318393,0c-0.372589,0 -0.697411,0.210179 -0.869375,0.525447l0.009554,0.009554z"/>
+    <path fill="#424242" d="m11.364995,7.38941l-6.73,0l3.36459,-5.82741l3.36542,5.82741l-0.00001,0z"/>
+    <path fill="#424242" d="m8.974,4.945l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
+    <path fill="#424242" d="M 10.5 5.258 L 5.5 5.258 L 10.5 5.258 Z M 6.046 4.313 L 9.954 4.313 L 6.046 4.313 Z M 13.608 5.134 C 13.532 4.676 13.13 4.313 12.653 4.313 L 9.954 4.313 L 10.5 5.258 L 12.777 5.258 L 13.732 11.946 L 12.414 11.946 C 12.041 11.946 11.716 12.156 11.544 12.471 L 11.554 12.481 L 11.134 13.331 C 10.971 13.656 10.637 13.866 10.264 13.866 L 5.717 13.866 C 5.354 13.866 5.029 13.656 4.866 13.341 L 4.446 12.471 C 4.284 12.156 3.949 11.946 3.596 11.946 L 2.268 11.946 L 3.223 5.258 L 5.5 5.258 L 6.046 4.313 L 3.347 4.313 C 2.87 4.313 2.468 4.676 2.392 5.134 L 1.312 11.955 L 1.312 16.732 C 1.312 17.258 1.742 17.688 2.268 17.688 L 13.732 17.688 C 14.258 17.688 14.688 17.258 14.688 16.732 L 14.688 11.955 L 13.608 5.134 Z"/>
 </svg>
diff --git a/images/light/icon-stash-save.svg b/images/light/icon-stash-save.svg
index 144ccd0..c741f46 100644
--- a/images/light/icon-stash-save.svg
+++ b/images/light/icon-stash-save.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
-    <path fill="#424242" d="m4.6975,6.8745l6.73,0l-3.36459,5.82741l-3.36542,-5.82741z"/>
-    <path fill="#424242" d="m8.9745,1.5075l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
-    <path fill="#424242" d="m14.687501,11.955358l-1.079554,-6.821251c-0.076429,-0.458572 -0.477679,-0.821607 -0.955357,-0.821607l-9.30518,0c-0.477679,0 -0.878929,0.363036 -0.955357,0.821607l-1.079554,6.821251l0,4.776787c0,0.525447 0.429911,0.955357 0.955357,0.955357l11.464288,0c0.525447,0 0.955357,-0.429911 0.955357,-0.955357l0,-4.776787l0,0zm-3.133572,0.525447l-0.420357,0.850268c-0.162411,0.324821 -0.496786,0.535 -0.869375,0.535l-4.547501,0c-0.363036,0 -0.687857,-0.210179 -0.850268,-0.525447l-0.420357,-0.869375c-0.162411,-0.315268 -0.496786,-0.525447 -0.850268,-0.525447l-1.327947,0l0.955357,-6.687501l9.553573,0l0.955357,6.687501l-1.318393,0c-0.372589,0 -0.697411,0.210179 -0.869375,0.525447l0.009554,0.009554z"/>
+    <path fill="#424242" d="m4.635005,6.8745l6.73,0l-3.36459,5.82741l-3.36542,-5.82741l0.00001,0z"/>
+    <path fill="#424242" d="m8.974,1.5075l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
+    <path fill="#424242" d="m6.5,4.313l3,0l-3,0zm3,0.945l-3,0l3,0zm4.108,-0.124c-0.076,-0.458 -0.478,-0.821 -0.955,-0.821l-3.153,0l0,0.945l3.277,0l0.955,6.688l-1.318,0c-0.373,0 -0.698,0.21 -0.87,0.525l0.01,0.01l-0.42,0.85c-0.163,0.325 -0.497,0.535 -0.87,0.535l-4.547,0c-0.363,0 -0.688,-0.21 -0.851,-0.525l-0.42,-0.87c-0.162,-0.315 -0.497,-0.525 -0.85,-0.525l-1.328,0l0.955,-6.688l3.277,0l0,-0.945l-3.153,0c-0.477,0 -0.879,0.363 -0.955,0.821l-1.08,6.821l0,4.777c0,0.526 0.43,0.956 0.956,0.956l11.464,0c0.526,0 0.956,-0.43 0.956,-0.956l0,-4.777l-1.08,-6.821z"/>
 </svg>
diff --git a/package.json b/package.json
index ea0c40a..69adf5a 100644
--- a/package.json
+++ b/package.json
@@ -3442,6 +3442,11 @@
                 {
                     "command": "gitlens.stashApply",
                     "when": "viewItem == gitlens:stash",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "gitlens.stashApply",
+                    "when": "viewItem == gitlens:stash",
                     "group": "1_gitlens@1"
                 },
                 {