Skip to content

Commit 1095691

Browse files
committed
fix regression on icons inside chips being styled wrongly
1 parent 42b3bd9 commit 1095691

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/components/mdChips/mdChip.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@click.native="!disabled && $emit('delete')"
99
@keyup.native.delete="!disabled && $emit('delete')"
1010
tabindex="-1">
11-
<md-icon>cancel</md-icon>
11+
<md-icon class="md-icon-delete">cancel</md-icon>
1212
</md-button>
1313
</div>
1414
</template>

src/components/mdInputContainer/mdInputContainer.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ $input-size: 32px;
6060
-webkit-text-fill-color: initial;
6161
}
6262

63-
~ .md-icon {
63+
~ .md-icon:not(.md-icon-delete) {
6464
margin-left: 12px;
6565

6666
&:after {
@@ -97,7 +97,7 @@ $input-size: 32px;
9797
right: 0;
9898
}
9999

100-
.md-icon {
100+
.md-icon:not(.md-icon-delete) {
101101
margin: 4px auto;
102102
color: rgba(#000, .54);
103103
transition: $swift-ease-out;

src/components/mdInputContainer/mdInputContainer.theme

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
textarea,
1111
.md-error,
1212
.md-count,
13-
.md-icon {
13+
.md-icon:not(.md-icon-delete) {
1414
color: #{'WARN-COLOR'};
1515
}
1616
}
@@ -41,7 +41,7 @@
4141
}
4242

4343
label,
44-
.md-icon {
44+
.md-icon:not(.md-icon-delete) {
4545
color: #{'PRIMARY-COLOR'};
4646
}
4747
}
@@ -52,13 +52,13 @@
5252
textarea,
5353
.md-error,
5454
.md-count,
55-
.md-icon,
55+
.md-icon:not(.md-icon-delete),
5656
::-webkit-input-placeholder {
5757
color: #{'BACKGROUND-CONTRAST-0.38'};
5858
}
5959
}
6060

61-
.md-icon:after {
61+
.md-icon:not(.md-icon-delete):after {
6262
background: #{'BACKGROUND-COLOR'};
6363
}
6464
}

0 commit comments

Comments
 (0)