Skip to content

Button ex mergestyles#3863

Merged
oengusmacinog-zz merged 5 commits into
microsoft:masterfrom
oengusmacinog-zz:ButtonEx-mergestyles
Feb 13, 2018
Merged

Button ex mergestyles#3863
oengusmacinog-zz merged 5 commits into
microsoft:masterfrom
oengusmacinog-zz:ButtonEx-mergestyles

Conversation

@oengusmacinog-zz

@oengusmacinog-zz oengusmacinog-zz commented Feb 1, 2018

Copy link
Copy Markdown
Collaborator

Pull request checklist

  • Include a change request file using $ npm run change

Description of changes

Converted ButtonBasicExample to use mergeStyles instead of SCSS.

Focus areas to test

Visually everything should be the same.

@gokunymbus gokunymbus left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fix the css function bits and you can complete this PR.


return (
<div className='ms-BasicButtonsExample'>
<div className={ css(classNames.example) }>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We don't need the css function for one class and at all anymore because merge styles takes care of merging a bunch of class names now.


return (
<div className='ms-BasicButtonsExample'>
<div className={ css(classNames.example) }>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same thing here, we don't need the css() function.


return (
<div className='ms-BasicButtonsTwoUp'>
<div className={ css(classNames.twoup) }>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same as comment above and all other instances.


return (
<div className='ms-BasicButtonsExample'>
<div className={ css(classNames.example) }>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same as above.

@oengusmacinog-zz oengusmacinog-zz merged commit 746b36e into microsoft:master Feb 13, 2018
@oengusmacinog-zz oengusmacinog-zz deleted the ButtonEx-mergestyles branch February 22, 2018 18:00
@microsoft microsoft locked as resolved and limited conversation to collaborators Aug 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants