From b38ffa079dd021dc653d2a942f8a82efa52f38e4 Mon Sep 17 00:00:00 2001
From: Jon Kuperman <jon.kuperman@gmail.com>
Date: Tue, 18 Oct 2016 16:31:28 -0700
Subject: [PATCH] Move bookmark hanger arrow now that reload is on about pages

---
 js/components/navigationBar.js |  6 +-----
 less/forms.less                | 10 ++--------
 less/navigationBar.less        |  4 ----
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
index edec6a8cf19..a53a2fc559a 100644
--- a/js/components/navigationBar.js
+++ b/js/components/navigationBar.js
@@ -122,9 +122,7 @@ class NavigationBar extends ImmutableComponent {
           originalDetail={this.props.bookmarkDetail.get('originalDetail')}
           destinationDetail={this.props.bookmarkDetail.get('destinationDetail')}
           shouldShowLocation={this.props.bookmarkDetail.get('shouldShowLocation')}
-          withStopButton={!isSourceAboutUrl(this.props.location)}
           withHomeButton={getSetting(settings.SHOW_HOME_BUTTON)}
-          withoutButtons={isSourceAboutUrl(this.props.location) && !getSetting(settings.SHOW_HOME_BUTTON)}
           />
         : null
         }
@@ -155,9 +153,7 @@ class NavigationBar extends ImmutableComponent {
             navbutton: true,
             bookmarkButton: true,
             removeBookmarkButton: this.bookmarked,
-            withStopButton: !isSourceAboutUrl(this.props.location),
-            withHomeButton: getSetting(settings.SHOW_HOME_BUTTON),
-            withoutButtons: isSourceAboutUrl(this.props.location) && !getSetting(settings.SHOW_HOME_BUTTON)
+            withHomeButton: getSetting(settings.SHOW_HOME_BUTTON)
           })}
           l10nId={this.bookmarked ? 'removeBookmarkButton' : 'addBookmarkButton'}
           onClick={this.onToggleBookmark} />
diff --git a/less/forms.less b/less/forms.less
index f84c8bcc1f3..04b66e9d72b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -429,14 +429,8 @@
       bottom: 10px;
       left: 37px;
 
-      &.withoutButtons {
-        left: 6px;
-      }
-
-      &.withStopButton {
-        &.withHomeButton {
-          left: 67px;
-        }
+      &.withHomeButton {
+        left: 67px;
       }
     }
 
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 96bc7e1730e..3adc4e980b8 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -641,10 +641,6 @@
       line-height: 25px;
       margin-top: 2px;
       margin-right: -2px;
-
-      &.withoutButtons {
-        margin-bottom: 2px;
-      }
     }
   }