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

Reordered Hamburger Menu with layout mentioned in #1893 #3003

Merged
merged 3 commits into from
Aug 18, 2016
Merged

Reordered Hamburger Menu with layout mentioned in #1893 #3003

merged 3 commits into from
Aug 18, 2016

Conversation

rohanthacker
Copy link

@rohanthacker rohanthacker commented Aug 6, 2016

  • [ x ] Submitted a ticket for my issue if one did not already exist.
  • [ x ] Used Github auto-closing keywords in the commit message.
  • [ x ] Ran git rebase -i to squash commits if needed.

Original Issue #1893

@@ -578,26 +569,14 @@ function hamburgerTemplateInit (location, e) {
CommonMenu.separatorMenuItem,
CommonMenu.importBookmarksMenuItem()
]
}, {
label: locale.translation('bravery'),
submenu: [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should still prefer the Bravery menu.

CC @bradleyrichter which order would you like it in?

@rohanthacker
Copy link
Author

@bradleyrichter @bbondy . The original menu items have been added back in pending appropriate Order, and decision on Report an Issue and Submit Feedback.

@@ -368,6 +369,14 @@ class UrlBar extends ImmutableComponent {
action='#'
id='urlbar'
ref='urlbar'>
<Button iconClass={this.titleMode ? 'fa-star' : 'fa-star-o'}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand, why was bookmarks moved into the urlbar component? It seems unrelated to the rest of the changeset.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is, It should be on another branch, not sure how it slipped in. This change is to tackle the new bookmark design.

@bbondy
Copy link
Member

bbondy commented Aug 18, 2016

Sorry for the delay, thank you! Merging in!

@bbondy bbondy merged commit 30b00cc into brave:master Aug 18, 2016
@luixxiul luixxiul added this to the 0.11.6dev milestone Aug 18, 2016
@rohanthacker
Copy link
Author

👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants