This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
Refactor bookmarksToolbar.js with Aphrodite #7923
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NejcZdovc
reviewed
Mar 27, 2017
| ? <span className={css( | ||
| styles.bookmarkToolbarButton__bookmarkFavicon, | ||
| styles.bookmarkToolbarButton__bookmarkFolder | ||
| ) + ' fa fa-folder-o'} |
| @@ -221,7 +241,7 @@ class BookmarkToolbarButton extends ImmutableComponent { | |||
| </span> | |||
| { | |||
| this.isFolder | |||
| ? <span className='bookmarkFolderChevron fa fa-chevron-down' /> | |||
| ? <span className={css(styles.bookmarkToolbarButton__bookmarkFolderChevron) + ' fa fa-chevron-down'} data-test-id='bookmarkFolderChevron' /> | |||
| styles.bookmarksToolbar, | ||
| this.props.shouldAllowWindowDrag && styles.bookmarksToolbar__allowDragging, | ||
| styles.bookmarksToolbar__showOnlyFavicon | ||
| ) + ' showFavicon showOnlyFavicon'} |
| className={css( | ||
| styles.bookmarksToolbar__bookmarkButton, | ||
| styles.bookmarksToolbar__overflowIndicator | ||
| ) + ' bookmarkButton'} /> |
| WebkitUserSelect: 'none', | ||
|
|
||
| ':hover': { | ||
| background: 'white', |
There was a problem hiding this comment.
please use HEX code for the color
|
@NejcZdovc I updated. |
NejcZdovc
reviewed
Mar 28, 2017
| ) + ' ' + cx({ | ||
| fa: true, | ||
| 'fa-folder-o': true | ||
| })} |
There was a problem hiding this comment.
I was thinking more something like this:
<span className={cx({
fa: true,
'fa-folder-o': true,
[css(styles.bookmarkToolbarButton__bookmarkFavicon)]: true,
[css(styles.bookmarkToolbarButton__bookmarkFolder)]: true
})}
This way you don't need + ' ' + and it's more readable in my opinion
There was a problem hiding this comment.
I like that. I will update later.
Closes #7920 bookmarksToolbarTest.js is updated thanks to the help of @NejcZdovc: https://github.com/luixxiul/browser-laptop/commit/abbd11c3715192617e981493943483a3de28e95f#commitcomment-21504404 Also: #7923 (comment) Auditor: Test Plan: 1. Automated test should be passing (CXX=g++-4.8 NODE_ENV=test TEST_DIR=bookmark-components) 2. Bookmark several pages if you have not 3. Test that creating a bookmark on the bookmarks toolbar works 4. Test that creating a bookmark folder on the bookmarks toolbar works 5. Test that moving a bookmark into a folder by drag and drop on the bookmarks folder works 6. Test that clicking a bookmark in the toolbar loads the bookmark. 7. Test that clicking a bookmark in a bookmark toolbar folder loads the bookmark. 8. Change the window size 9. Make sure the overflow indicator is displayed on the right of the bookmarks toolbar
bsclifton
reviewed
Apr 3, 2017
bsclifton
approved these changes
Apr 3, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Test Plan
Description
Closes #7920
bookmarksToolbarTest.js is updated thanks to the help of @NejcZdovc: https://github.com/luixxiul/browser-laptop/commit/abbd11c3715192617e981493943483a3de28e95f#commitcomment-21504404
git rebase -ito squash commits (if needed).