Skip to content

Commit

Permalink
fix(chips): wrong margin on single chip (#4366)
Browse files Browse the repository at this point in the history
* Fixes single chips having a left margin.
* Reduces the amount of CSS used to set up the chip margins.

Fixes #4359.
  • Loading branch information
crisbeto authored and andrewseguin committed May 2, 2017
1 parent 1fd50aa commit 5d03c1a
Showing 1 changed file with 9 additions and 38 deletions.
47 changes: 9 additions & 38 deletions src/lib/chips/chips.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,10 @@ $mat-chip-line-height: 16px;
$mat-chips-chip-margin: $mat-chip-horizontal-padding / 4;

.mat-chip-list-wrapper {

display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: flex-start;

/*
* Only apply the margins to chips
*/
.mat-chip:not(.mat-basic-chip) {
margin: 0 $mat-chips-chip-margin 0 $mat-chips-chip-margin;

// Remove the margin from the first element (in both LTR and RTL)
&:first-child {
margin: {
left: 0;
right: $mat-chips-chip-margin;
}

[dir='rtl'] & {
margin: {
left: $mat-chips-chip-margin;
right: 0;
}
}
}

// Remove the margin from the last element (in both LTR and RTL)
&:last-child {
margin: {
left: $mat-chips-chip-margin;
right: 0;
}

[dir='rtl'] & {
margin: {
left: 0;
right: $mat-chips-chip-margin;
}
}
}
}
}

.mat-chip:not(.mat-basic-chip) {
Expand All @@ -57,6 +19,15 @@ $mat-chips-chip-margin: $mat-chip-horizontal-padding / 4;

font-size: $mat-chip-font-size;
line-height: $mat-chip-line-height;

// Apply a margin to adjacent sibling chips.
& + & {
margin: 0 0 0 $mat-chips-chip-margin;

[dir='rtl'] & {
margin: 0 $mat-chips-chip-margin 0 0;
}
}
}

.mat-chip-list-stacked .mat-chip-list-wrapper {
Expand Down

0 comments on commit 5d03c1a

Please sign in to comment.