Merge remote-tracking branch 'origin/develop' into components/mdProgress

* origin/develop:
  fix regression on icons inside chips being styled wrongly

src/components/mdChips/mdChip.vue

@@ -8,7 +8,7 @@
       @click.native="!disabled && $emit('delete')"
       @keyup.native.delete="!disabled && $emit('delete')"
       tabindex="-1">
-      <md-icon>cancel</md-icon>
+      <md-icon class="md-icon-delete">cancel</md-icon>
     </md-button>
   </div>
 </template>

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;

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'};
     }
   }