Skip to content

Adds example of primary button with icon #2

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

Closed
mike-morr wants to merge 2 commits into from
Closed

Adds example of primary button with icon #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a1a83e
Adds example of primary button with icon
mike-morr Jul 22, 2016
6679018
Nested class and now includes the margin macros
mike-morr Jul 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
@import '~office-ui-fabric/src/sass/Fabric.Common';

.ms-BasicButtonsExample .ms-Button {
margin: 10px 0;

.ms-Icon {
@include margin-right(5px);
@include margin-left(-10px);
}
}

6 changes: 6 additions & 0 deletions src/demo/pages/ButtonPage/examples/Button.Basic.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ export class ButtonBasicExample extends React.Component<any, IBasicButtonsExampl
<Label>Command button</Label>
<Button disabled={ disabled } buttonType={ ButtonType.command } icon='personAdd' description='Description of the action this button takes'>Create account</Button>

<Label>Primary Button with Icon</Label>
<Button disabled={ disabled } buttonType={ ButtonType.primary } title='Star' description='Description of the action this button takes'>
Copy link
Member

@dzearing dzearing Jul 22, 2016

Choose a reason for hiding this comment

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

you could add a classname to this button if you'd like, e.g. 'ms-ButtonBasicExample-customButton'

then your scoped css would be:

.ms-ButtonBasicExample-customButton .ms-Icon {
...
}

<i className='ms-Icon ms-Icon--star' />
<span>I am a button.</span>
</Button>

<Label>Icon button</Label>
<Button disabled={ disabled } buttonType={ ButtonType.icon } icon='star' title='Star' ariaLabel='Take a star' />

Expand Down