From 0a1a83e500791dfef55a0617d3b5f283763d201f Mon Sep 17 00:00:00 2001
From: Mike Morrison <tellmike@outlook.com>
Date: Fri, 22 Jul 2016 11:16:21 -0500
Subject: [PATCH 1/2] Adds example of primary button with icon

---
 .../pages/ButtonPage/examples/Button.Basic.Example.scss     | 5 +++++
 src/demo/pages/ButtonPage/examples/Button.Basic.Example.tsx | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss b/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss
index 8bfbea5dd0bde5..630cb2ced9f7b3 100644
--- a/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss
+++ b/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss
@@ -1,3 +1,8 @@
 .ms-BasicButtonsExample .ms-Button {
   margin: 10px 0;
 }
+
+.ms-Icon {
+  margin-right: 5px;
+  margin-left: -10px;
+}
diff --git a/src/demo/pages/ButtonPage/examples/Button.Basic.Example.tsx b/src/demo/pages/ButtonPage/examples/Button.Basic.Example.tsx
index f80893f1c07a0f..c81db5afddb046 100644
--- a/src/demo/pages/ButtonPage/examples/Button.Basic.Example.tsx
+++ b/src/demo/pages/ButtonPage/examples/Button.Basic.Example.tsx
@@ -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'>
+          <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' />
 

From 6679018b7e5aa43b65820319e250a9d5bce1928d Mon Sep 17 00:00:00 2001
From: Mike Morrison <tellmike@outlook.com>
Date: Fri, 22 Jul 2016 15:43:00 -0500
Subject: [PATCH 2/2] Nested class and now includes the margin macros

---
 .../ButtonPage/examples/Button.Basic.Example.scss     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss b/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss
index 630cb2ced9f7b3..e6c7bb5d09cd47 100644
--- a/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss
+++ b/src/demo/pages/ButtonPage/examples/Button.Basic.Example.scss
@@ -1,8 +1,11 @@
+@import '~office-ui-fabric/src/sass/Fabric.Common';
+
 .ms-BasicButtonsExample .ms-Button {
   margin: 10px 0;
-}
 
-.ms-Icon {
-  margin-right: 5px;
-  margin-left: -10px;
+  .ms-Icon {
+    @include margin-right(5px);
+    @include margin-left(-10px);
+  }
 }
+