Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge button #229

Merged
merged 16 commits into from
Aug 24, 2018
Merged

Fix merge button #229

merged 16 commits into from
Aug 24, 2018

Commits on Aug 23, 2018

  1. replace Box+position w/Absolute in MergeButton demo

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    2bb25ae View commit details
    Browse the repository at this point in the history

  2. use css instead of style prop in MergeActions

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    4c8e9ef View commit details
    Browse the repository at this point in the history

  3. use css prop, create styled Arrow component

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    91cd483 View commit details
    Browse the repository at this point in the history

  4. clean up MergeButton utility classes

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    3e3f0bf View commit details
    Browse the repository at this point in the history

  5. use <FlexContainer>

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    a1efdf4 View commit details
    Browse the repository at this point in the history

  6. add listStyle system prop

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    2f794dd View commit details
    Browse the repository at this point in the history

  7. add default border props to Box per #222

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    6647702 View commit details
    Browse the repository at this point in the history

  8. use Box.defaultProps.borderColor in BorderBox

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    a638ac4 View commit details
    Browse the repository at this point in the history

  9. use emotion system components for MergeButton list

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    0ce829f View commit details
    Browse the repository at this point in the history

  10. lint

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    26f1348 View commit details
    Browse the repository at this point in the history

  11. restore Box and BorderBox props

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    ae933f6 View commit details
    Browse the repository at this point in the history

  12. just use borderColor:"gray.2"

    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    5c99185 View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'origin/release-2.0.1-beta' into fix-mer… 

    …ge-button
    @shawnbot
    shawnbot committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    dc5233c View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2018

  1. lint

    @shawnbot
    shawnbot committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    170e247 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release-2.0.1-beta' into fix-mer… 

    …ge-button
    @shawnbot
    shawnbot committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    3f77d00 View commit details
    Browse the repository at this point in the history

  3. simplify MergeButton even more

    @shawnbot
    shawnbot committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    bd8c517 View commit details
    Browse the repository at this point in the history