From 240ecb71ded8b7fc2456379a53d690dd4d31c6a2 Mon Sep 17 00:00:00 2001
From: Katrina Uychaco <kuychaco@gmail.com>
Date: Thu, 2 Nov 2017 16:43:13 -0700
Subject: [PATCH 1/3] Move "Undo Discard" button to the bottom of Unstaged
 Changes list

---
 lib/views/staging-view.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js
index ef713a3e46..cb4148b5e5 100644
--- a/lib/views/staging-view.js
+++ b/lib/views/staging-view.js
@@ -515,8 +515,6 @@ export default class StagingView {
             <span className="github-StagingView-title">Unstaged Changes</span>
             {this.props.unstagedChanges.length ? this.renderStageAllButton() : null}
           </header>
-          {this.props.hasUndoHistory ? this.renderUndoButton() : null}
-
           <div ref="unstagedChanges" className="github-StagingView-list github-FilePatchListView">
             {
               this.truncatedLists.unstagedChanges.map(filePatch => (
@@ -534,6 +532,7 @@ export default class StagingView {
             }
           </div>
           {this.renderTruncatedMessage(this.props.unstagedChanges)}
+          {this.props.hasUndoHistory ? this.renderUndoButton() : null}
         </div>
         { this.renderMergeConflicts() }
         <div className={`github-StagingView-group github-StagedChanges ${this.getFocusClass('staged')}`} >
@@ -648,7 +647,7 @@ export default class StagingView {
 
   renderUndoButton() {
     return (
-      <button className="github-StagingView-headerButton github-StagingView-headerButton--fullWidth icon icon-history"
+      <button className="github-StagingView-headerButton github-StagingView-headerButton--fullWidth btn icon icon-history"
         onclick={this.undoLastDiscard}>Undo Discard</button>
     );
   }

From 8d1c2cf8068ae96f2bdb05b4c302b4b325c4b587 Mon Sep 17 00:00:00 2001
From: Katrina Uychaco <kuychaco@gmail.com>
Date: Thu, 2 Nov 2017 17:58:26 -0700
Subject: [PATCH 2/3] Style button

---
 styles/staging-view.less | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/styles/staging-view.less b/styles/staging-view.less
index 4452f038bc..c34b72c85d 100644
--- a/styles/staging-view.less
+++ b/styles/staging-view.less
@@ -59,7 +59,11 @@
 
     &--fullWidth {
       border-left: none;
-      border-bottom: 1px solid @panel-heading-border-color;
+      background: none !important;
+      border: 1px solid @panel-heading-border-color;
+      border-radius: @component-border-radius;
+      margin: @component-padding;
+      cursor: pointer;
     }
   }
 

From baab86d360d7dc130717b3ec340e1cb5f12494aa Mon Sep 17 00:00:00 2001
From: Katrina Uychaco <kuychaco@gmail.com>
Date: Thu, 2 Nov 2017 18:17:33 -0700
Subject: [PATCH 3/3] :shirt:

---
 lib/views/staging-view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js
index cb4148b5e5..c7aa06fdbf 100644
--- a/lib/views/staging-view.js
+++ b/lib/views/staging-view.js
@@ -646,8 +646,9 @@ export default class StagingView {
   }
 
   renderUndoButton() {
+    const classes = 'github-StagingView-headerButton github-StagingView-headerButton--fullWidth btn icon icon-history';
     return (
-      <button className="github-StagingView-headerButton github-StagingView-headerButton--fullWidth btn icon icon-history"
+      <button className={classes}
         onclick={this.undoLastDiscard}>Undo Discard</button>
     );
   }