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.

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

[Button] Fix padding for Text Button variant to adhere to spec #13827

Merged
merged 2 commits into from
Dec 10, 2018
Merged

[Button] Fix padding for Text Button variant to adhere to spec #13827

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
3913826
Fix padding for Text Button variant to adhere to spec
bdeloeste Dec 5, 2018
51a1a05
let's merge
oliviertassinari Dec 8, 2018
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
2 changes: 1 addition & 1 deletion docs/src/pages/customization/themes/OverridesCss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const theme = createMuiTheme({
// Name of the component ⚛️ / style sheet
MuiButton: {
// Name of the rule
root: {
text: {
// Some CSS
background: 'linear-gradient(45deg, #FE6B8B 30%, #FF8E53 90%)',
borderRadius: 3,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/customization/themes/themes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ That's a really powerful feature.
const theme = createMuiTheme({
overrides: {
MuiButton: { // Name of the component ⚛️ / style sheet
root: { // Name of the rule
text: { // Name of the rule
color: 'white', // Some CSS
},
},
Expand Down
10 changes: 6 additions & 4 deletions packages/material-ui/src/Button/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ export const styles = theme => ({
justifyContent: 'inherit',
},
/* Styles applied to the root element if `variant="text"`. */
text: {},
text: {
padding: theme.spacing.unit,
},
/* Styles applied to the root element if `variant="text"` and `color="primary"`. */
textPrimary: {
color: theme.palette.primary.main,
Expand Down Expand Up @@ -250,9 +252,9 @@ function Button(props) {
[classes.text]: text,
[classes.textPrimary]: text && color === 'primary',
[classes.textSecondary]: text && color === 'secondary',
[classes.flat]: variant === 'text' || variant === 'flat',
[classes.flatPrimary]: (variant === 'text' || variant === 'flat') && color === 'primary',
[classes.flatSecondary]: (variant === 'text' || variant === 'flat') && color === 'secondary',
[classes.flat]: text,
[classes.flatPrimary]: text && color === 'primary',
[classes.flatSecondary]: text && color === 'secondary',
[classes.contained]: contained || fab,
[classes.containedPrimary]: (contained || fab) && color === 'primary',
[classes.containedSecondary]: (contained || fab) && color === 'secondary',
Expand Down
8 changes: 8 additions & 0 deletions packages/material-ui/src/Button/Button.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ describe('<Button />', () => {
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.flat), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.text), true);
assert.strictEqual(wrapper.hasClass(classes.textPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.textSecondary), false);
assert.strictEqual(wrapper.hasClass(classes.flatPrimary), false);
Expand Down Expand Up @@ -75,6 +76,7 @@ describe('<Button />', () => {
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.text), false);
assert.strictEqual(wrapper.hasClass(classes.textPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.textSecondary), false);
});
Expand All @@ -88,6 +90,7 @@ describe('<Button />', () => {
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.text), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), true);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), false);
});
Expand All @@ -101,20 +104,23 @@ describe('<Button />', () => {
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.text), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), true);
});

it('should render a small button', () => {
const wrapper = shallow(<Button size="small">Hello World</Button>);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.text), true);
assert.strictEqual(wrapper.hasClass(classes.sizeSmall), true);
assert.strictEqual(wrapper.hasClass(classes.sizeLarge), false);
});

it('should render a large button', () => {
const wrapper = shallow(<Button size="large">Hello World</Button>);
assert.strictEqual(wrapper.hasClass(classes.root), true);
assert.strictEqual(wrapper.hasClass(classes.text), true);
assert.strictEqual(wrapper.hasClass(classes.sizeSmall), false);
assert.strictEqual(wrapper.hasClass(classes.sizeLarge), true);
});
Expand All @@ -134,6 +140,7 @@ describe('<Button />', () => {
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.text), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), false);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), false);
Expand All @@ -150,6 +157,7 @@ describe('<Button />', () => {
assert.strictEqual(wrapper.hasClass(classes.contained), true);
assert.strictEqual(wrapper.hasClass(classes.raised), true);
assert.strictEqual(wrapper.hasClass(classes.fab), false);
assert.strictEqual(wrapper.hasClass(classes.text), false);
assert.strictEqual(wrapper.hasClass(classes.containedPrimary), true);
assert.strictEqual(wrapper.hasClass(classes.raisedPrimary), true);
assert.strictEqual(wrapper.hasClass(classes.containedSecondary), false);
Expand Down