From b62ada5a1e45cb42641c7fcca631f1bde64ad4d3 Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Thu, 29 Dec 2016 02:45:01 -0200 Subject: [PATCH] fix regression on icons inside chips being styled wrongly --- src/components/mdChips/mdChip.vue | 2 +- src/components/mdInputContainer/mdInputContainer.scss | 4 ++-- src/components/mdInputContainer/mdInputContainer.theme | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/mdChips/mdChip.vue b/src/components/mdChips/mdChip.vue index ca8482f..753d9f0 100644 --- a/src/components/mdChips/mdChip.vue +++ b/src/components/mdChips/mdChip.vue @@ -8,7 +8,7 @@ @click.native="!disabled && $emit('delete')" @keyup.native.delete="!disabled && $emit('delete')" tabindex="-1"> - cancel + cancel diff --git a/src/components/mdInputContainer/mdInputContainer.scss b/src/components/mdInputContainer/mdInputContainer.scss index 713ea58..a3c2482 100644 --- a/src/components/mdInputContainer/mdInputContainer.scss +++ b/src/components/mdInputContainer/mdInputContainer.scss @@ -60,7 +60,7 @@ $input-size: 32px; -webkit-text-fill-color: initial; } - ~ .md-icon { + ~ .md-icon:not(.md-icon-delete) { margin-left: 12px; &:after { @@ -97,7 +97,7 @@ $input-size: 32px; right: 0; } - .md-icon { + .md-icon:not(.md-icon-delete) { margin: 4px auto; color: rgba(#000, .54); transition: $swift-ease-out; diff --git a/src/components/mdInputContainer/mdInputContainer.theme b/src/components/mdInputContainer/mdInputContainer.theme index 9c29f7a..bc544e1 100644 --- a/src/components/mdInputContainer/mdInputContainer.theme +++ b/src/components/mdInputContainer/mdInputContainer.theme @@ -10,7 +10,7 @@ textarea, .md-error, .md-count, - .md-icon { + .md-icon:not(.md-icon-delete) { color: #{'WARN-COLOR'}; } } @@ -41,7 +41,7 @@ } label, - .md-icon { + .md-icon:not(.md-icon-delete) { color: #{'PRIMARY-COLOR'}; } } @@ -52,13 +52,13 @@ textarea, .md-error, .md-count, - .md-icon, + .md-icon:not(.md-icon-delete), ::-webkit-input-placeholder { color: #{'BACKGROUND-CONTRAST-0.38'}; } } - .md-icon:after { + .md-icon:not(.md-icon-delete):after { background: #{'BACKGROUND-COLOR'}; } }