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.

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

[Chip] Add outlined variant #12680

Merged
merged 27 commits into from
Aug 28, 2018
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1397e2a
add support for outlined chip
orporan Aug 27, 2018
2477220
fix ChipsPlayground
orporan Aug 27, 2018
a895a1e
yarn prettier
orporan Aug 27, 2018
d961db8
yarn docs:api
orporan Aug 27, 2018
e8c5a02
update size limit
orporan Aug 27, 2018
1adbe87
Add hover and focus background color for outlined chip
orporan Aug 27, 2018
0881271
yarn prettier
orporan Aug 27, 2018
a670700
Add focus state for deletable outlined chip
orporan Aug 27, 2018
75d73eb
Fix chip documentation issue
orporan Aug 27, 2018
4500f1e
Revert last commit
orporan Aug 27, 2018
3892c51
empty commit to trigger build
orporan Aug 28, 2018
475c92d
Add demo seperate demo section to outlined chip
orporan Aug 28, 2018
eec38e7
empty commit to trigger build
orporan Aug 28, 2018
848a11f
empty commit to trigger build
orporan Aug 28, 2018
471eca0
PR review fixes
orporan Aug 28, 2018
4bddff3
PR review fixes
orporan Aug 28, 2018
6dfab0b
empty commit to trigger build
orporan Aug 28, 2018
135e45d
empty commit to trigger build
orporan Aug 28, 2018
223485d
Merge branch 'master' into add-outlined-chip
mbrookes Aug 28, 2018
0902b25
empty commit to trigger build
orporan Aug 28, 2018
75af4c7
fix size limit after merge
orporan Aug 28, 2018
7c6bfdf
Add tests for outlined chip
orporan Aug 28, 2018
602caae
yarn prettier
orporan Aug 28, 2018
acf70d2
empty commit to trigger build
orporan Aug 28, 2018
2be6635
Fix demo labels for chip
orporan Aug 28, 2018
e4736c6
Update chips.md
oliviertassinari Aug 28, 2018
34f7b23
let's merge
oliviertassinari Aug 28, 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
Prev Previous commit
Next Next commit
Add hover and focus background color for outlined chip
orporan committed Aug 27, 2018
commit 1adbe879c1524976df04ee7b5db0937e79e0d4ed
7 changes: 5 additions & 2 deletions packages/material-ui/src/Chip/Chip.js
Original file line number Diff line number Diff line change
@@ -107,12 +107,15 @@ export const styles = theme => {
border: `1px solid ${
theme.palette.type === 'light' ? 'rgba(0, 0, 0, 0.23)' : 'rgba(255, 255, 255, 0.23)'
}`,
'$clickable&:hover, $clickable&:focus': {
backgroundColor: fade(theme.palette.text.primary, theme.palette.action.hoverOpacity),
}
},
/* Styles applied to the root element if `variant="outlined"` and `color="primary"`. */
outlinedPrimary: {
color: theme.palette.primary.main,
border: `1px solid ${fade(theme.palette.primary.main, 0.5)}`,
'$clickable&:hover': {
'$clickable&:hover, $clickable&:focus': {
backgroundColor: fade(theme.palette.primary.main, theme.palette.action.hoverOpacity),
border: `1px solid ${theme.palette.primary.main}`,
},
@@ -121,7 +124,7 @@ export const styles = theme => {
outlinedSecondary: {
color: theme.palette.secondary.main,
border: `1px solid ${fade(theme.palette.secondary.main, 0.5)}`,
'$clickable&:hover': {
'$clickable&:hover, $clickable&:focus': {
backgroundColor: fade(theme.palette.secondary.main, theme.palette.action.hoverOpacity),
border: `1px solid ${theme.palette.secondary.main}`,
},