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

fix conflict with react-stickynode #2081

Merged
merged 1 commit into from
Jun 6, 2016
Merged

fix conflict with react-stickynode #2081

merged 1 commit into from
Jun 6, 2016

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented Jun 4, 2016

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

addresses #2077.

This fixes styling of .bookmarkFolderList under .sticky-inner-wrapper which was introduced with react-stickynode, Now .listItem should be aligned well (#2078).

@bbondy, would you please audit this one?

@luixxiul luixxiul added this to the 0.10.4dev milestone Jun 6, 2016
@bbondy
Copy link
Member

bbondy commented Jun 6, 2016

++

@bbondy bbondy merged commit 23c0790 into brave:master Jun 6, 2016
@luixxiul luixxiul deleted the bookmarkList branch June 6, 2016 13:01
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.

2 participants