feat(Tag): primary and closable primary use same style

alibaba-fusion · Apr 18, 2019 · 28d4738 · 28d4738
1 parent b82e7b1
commit 28d4738
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 61 deletions.
diff --git a/src/tag/scss/placeholder.scss b/src/tag/scss/placeholder.scss
@@ -39,18 +39,18 @@
 
 %tag-statement-closable-primary {
     @include tag-statement(
-        $tag-closable-primary-text-color,
-        $tag-closable-primary-border-color,
-        $tag-closable-primary-bg-color,
-        $tag-closable-primary-text-color-hover,
-        $tag-closable-primary-border-color-hover,
-        $tag-closable-primary-bg-color-hover,
-        $tag-closable-primary-tail-color,
-        $tag-closable-primary-tail-color-hover,
-        $tag-closable-primary-tail-color-disabled,
-        $tag-closable-primary-text-color-disabled,
-        $tag-closable-primary-border-color-disabled,
-        $tag-closable-primary-bg-color-disabled
+        $tag-fill-text-color,
+        $tag-fill-border-color,
+        $tag-fill-bg-color,
+        $tag-fill-text-color-hover,
+        $tag-fill-border-color-hover,
+        $tag-fill-bg-color-hover,
+        $tag-fill-tail-color,
+        $tag-fill-tail-color-hover,
+        $tag-fill-tail-color-disabled,
+        $tag-fill-text-color-disabled,
+        $tag-fill-border-color-disabled,
+        $tag-fill-bg-color-disabled
     );
 }
 

diff --git a/src/tag/scss/variable.scss b/src/tag/scss/variable.scss
@@ -7,7 +7,7 @@
 /// @family data-display
 /// @varPrefix $tag-
 /// @classPrefix {prefix}-tag
-/// @order {"size/bounding":10,"size/content":11,"size/tail":12,"size/tick":13,"statement/normal":10,"statement/normal/content":100,"statement/normal/bounding":101,"statement/normal/tail":102,"statement/hover":11,"statement/hover/content":110,"statement/hover/bounding":111,"statement/hover/tail":112,"statement/disabled":12,"statement/disabled/content":120,"statement/disabled/bounding":121,"statement/disabled/tail":122,"statement/selected":13,"statement/selected/tick":130,"statement/selected-hover":14,"statement/selected-hover/tick":140,"statement/selected-disabled":15,"statement/selected-disabled/tick":150}
+/// @order {"size/bounding":10,"size/content":11,"size/tail":12,"size/tick":13,"statement/normal":10,"statement/normal/bounding":100,"statement/normal/tail":101,"statement/hover":11,"statement/hover/tail":110,"statement/hover/bounding":111,"statement/disabled":12,"statement/disabled/tail":120,"statement/disabled/bounding":121,"statement/disabled/text":122,"statement/disabled/background":123,"statement/selected":13,"statement/selected/tick":130,"statement/selected-hover":14,"statement/selected-hover/tick":140,"statement/selected-disabled":15,"statement/selected-disabled/bounding":150,"statement/selected-disabled/tick":151}
 ////
 
 
@@ -212,54 +212,6 @@ $tag-closable-bordered-text-color-disabled: $color-text1-1 !default;
 /// @namespace statement/disabled/bounding
 $tag-closable-bordered-bg-disabled: $color-transparent !default;
 
-/// text
-/// @namespace statement/normal/bounding
-$tag-closable-primary-text-color: $color-text1-3 !default;
-
-/// text
-/// @namespace statement/normal/tail
-$tag-closable-primary-tail-color: $color-text1-3 !default;
-
-/// text
-/// @namespace statement/disabled/bounding
-$tag-closable-primary-text-color-disabled: $color-text1-1 !default;
-
-/// border
-/// @namespace statement/disabled/bounding
-$tag-closable-primary-border-color-disabled: $color-fill1-1 !default;
-
-/// background
-/// @namespace statement/disabled/bounding
-$tag-closable-primary-bg-color-disabled: $color-fill1-1 !default;
-
-/// text
-/// @namespace statement/disabled/tail
-$tag-closable-primary-tail-color-disabled: $color-text1-1 !default;
-
-/// text
-/// @namespace statement/hover/bounding
-$tag-closable-primary-text-color-hover: $color-text1-4 !default;
-
-/// text
-/// @namespace statement/hover/tail
-$tag-closable-primary-tail-color-hover: $color-text1-4 !default;
-
-/// background
-/// @namespace statement/normal/bounding
-$tag-closable-primary-bg-color: $color-fill1-3 !default;
-
-/// border
-/// @namespace statement/normal/bounding
-$tag-closable-primary-border-color: $color-fill1-3 !default;
-
-/// background
-/// @namespace statement/hover/bounding
-$tag-closable-primary-bg-color-hover: $color-fill1-4 !default;
-
-/// border
-/// @namespace statement/hover/bounding
-$tag-closable-primary-border-color-hover: $color-fill1-4 !default;
-
 /// text
 /// @namespace statement/normal/tail
 $tag-fill-tail-color: $color-text1-3 !default;