Merge pull request mui#3988 from echenley/bugfix/raised-button-font-size

[RaisedButton] Respect theme fontSize
w01fgang · May 12, 2016 · 8c0ec6f · 8c0ec6f
2 parents 2feb02a + 54d8223
commit 8c0ec6f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/RaisedButton/RaisedButton.js b/src/RaisedButton/RaisedButton.js
@@ -78,7 +78,7 @@ function getStyles(props, context, state) {
     label: {
       position: 'relative',
       opacity: 1,
-      fontSize: '14px',
+      fontSize: raisedButton.fontSize,
       letterSpacing: 0,
       textTransform: raisedButton.textTransform || button.textTransform || 'uppercase',
       fontWeight: raisedButton.fontWeight,

diff --git a/src/RaisedButton/RaisedButton.spec.js b/src/RaisedButton/RaisedButton.spec.js
@@ -91,4 +91,16 @@ describe('<RaisedButton />', () => {
       );
     });
   });
+
+  it('inherits fontSize from theme', () => {
+    const wrapper = shallowWithContext(
+      <RaisedButton label="test" />
+    );
+
+    assert.strictEqual(wrapper.contains('test'), true);
+    assert.equal(
+      wrapper.find('[children="test"]').prop('style').fontSize,
+      muiTheme.raisedButton.fontSize
+    );
+  });
 });
diff --git a/src/styles/getMuiTheme.js b/src/styles/getMuiTheme.js
@@ -189,6 +189,7 @@ export default function getMuiTheme(muiTheme, ...more) {
       secondaryTextColor: palette.alternateTextColor,
       disabledColor: darken(palette.alternateTextColor, 0.1),
       disabledTextColor: fade(palette.textColor, 0.3),
+      fontSize: typography.fontStyleButtonFontSize,
       fontWeight: typography.fontWeightMedium,
     },
     refreshIndicator: {