Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Move bookmark hanger arrow now that reload is on about pages
Browse files Browse the repository at this point in the history
  • Loading branch information
jkup committed Oct 18, 2016
1 parent 75c3880 commit b38ffa0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 17 deletions.
6 changes: 1 addition & 5 deletions js/components/navigationBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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} />
Expand Down
10 changes: 2 additions & 8 deletions less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -429,14 +429,8 @@
bottom: 10px;
left: 37px;

&.withoutButtons {
left: 6px;
}

&.withStopButton {
&.withHomeButton {
left: 67px;
}
&.withHomeButton {
left: 67px;
}
}

Expand Down
4 changes: 0 additions & 4 deletions less/navigationBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,6 @@
line-height: 25px;
margin-top: 2px;
margin-right: -2px;

&.withoutButtons {
margin-bottom: 2px;
}
}
}

Expand Down

0 comments on commit b38ffa0

Please sign in to comment.