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.

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

Add button style to checkbox #3697

Merged
merged 6 commits into from
Apr 21, 2017
Merged

Conversation

mdartic
Copy link
Contributor

@mdartic mdartic commented Mar 22, 2017

Related to #3601

I add

  • button style to checkbox
  • fill, size, textColor props to checkbox-group
  • use cases in spec

Tell me if you agree with my PR, and if not what I have to change to make you accept it ?

Hope it will help !

Please makes sure these boxes are checked before submitting your PR, thank you!

  • Make sure you follow Element's contributing guide (中文 | English).
  • Make sure you are merging your commits to dev branch.
  • Add some descriptions and refer relative issues for you PR.

@mdartic
Copy link
Contributor Author

mdartic commented Mar 30, 2017

Hello @QingWei-Li and @Leopoldthecoder

What do you think of this PR ?

@Leopoldthecoder
Copy link
Contributor

This PR is big enough to be shipped with our next minor version. So we'll come back to this before 1.3.0 release.

@Leopoldthecoder
Copy link
Contributor

Some conflicts came up after #3700. Could you resolve them? Thank you.

@QingWei-Li QingWei-Li added this to the 1.3.0 milestone Mar 31, 2017
@mdartic
Copy link
Contributor Author

mdartic commented Mar 31, 2017

I'm on it to fix and implement new tests.

@mdartic
Copy link
Contributor Author

mdartic commented Mar 31, 2017

Well, after some mistakes with a bad rebase, I think it's ok now.

I add the min/max feature on the checkbox button too, and integrate in on an example of checkbox-group buttons.

Hope it will be ok.

@Leopoldthecoder
Copy link
Contributor

Hi, I'll take a look at this later this week. Thank you for your patience.

@Leopoldthecoder Leopoldthecoder merged commit 0bf50bf into ElemeFE:dev Apr 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants