Skip to content

Commit

Permalink
Merge pull request alibaba-fusion#698 from alibaba-fusion/revert-689-…
Browse files Browse the repository at this point in the history 
…master

Revert "Message: split border radius variables"
  • Loading branch information
@tao1991123
tao1991123 authored May 22, 2019
2 parents 22f6202 + 661e03d commit cdcb79f
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 27 deletions.
34 changes: 18 additions & 16 deletions src/message/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
$message-success-color-icon-inline,
$message-success-color-bg-inline,
$message-success-color-border-inline,
$message-border-radius,
none,
$message-success-icon-content
);
Expand All @@ -44,6 +45,7 @@
$message-success-color-icon-addon,
transparent,
transparent,
$message-border-radius,
none,
$message-success-icon-content
);
Expand All @@ -56,6 +58,7 @@
$message-success-color-icon-toast,
$message-success-color-bg-toast,
$message-success-color-border-toast,
$message-border-radius-toast,
$message-shadow-toast,
$message-success-icon-content
);
Expand All @@ -71,6 +74,7 @@
$message-warning-color-icon-inline,
$message-warning-color-bg-inline,
$message-warning-color-border-inline,
$message-border-radius,
none,
$message-warning-icon-content
);
Expand All @@ -83,6 +87,7 @@
$message-warning-color-icon-addon,
transparent,
transparent,
$message-border-radius,
none,
$message-warning-icon-content
);
Expand All @@ -95,6 +100,7 @@
$message-warning-color-icon-toast,
$message-warning-color-bg-toast,
$message-warning-color-border-toast,
$message-border-radius-toast,
$message-shadow-toast,
$message-warning-icon-content
);
Expand All @@ -110,6 +116,7 @@
$message-error-color-icon-inline,
$message-error-color-bg-inline,
$message-error-color-border-inline,
$message-border-radius,
none,
$message-error-icon-content
);
Expand All @@ -122,6 +129,7 @@
$message-error-color-icon-addon,
transparent,
transparent,
$message-border-radius,
none,
$message-error-icon-content
);
Expand All @@ -134,6 +142,7 @@
$message-error-color-icon-toast,
$message-error-color-bg-toast,
$message-error-color-border-toast,
$message-border-radius-toast,
$message-shadow-toast,
$message-error-icon-content
);
Expand All @@ -149,6 +158,7 @@
$message-notice-color-icon-inline,
$message-notice-color-bg-inline,
$message-notice-color-border-inline,
$message-border-radius,
none,
$message-notice-icon-content
);
Expand All @@ -161,6 +171,7 @@
$message-notice-color-icon-addon,
transparent,
transparent,
$message-border-radius,
none,
$message-notice-icon-content
);
Expand All @@ -173,6 +184,7 @@
$message-notice-color-icon-toast,
$message-notice-color-bg-toast,
$message-notice-color-border-toast,
$message-border-radius-toast,
$message-shadow-toast,
$message-notice-icon-content
);
Expand All @@ -188,6 +200,7 @@
$message-help-color-icon-inline,
$message-help-color-bg-inline,
$message-help-color-border-inline,
$message-border-radius,
none,
$message-help-icon-content
);
Expand All @@ -200,6 +213,7 @@
$message-help-color-icon-addon,
transparent,
transparent,
$message-border-radius,
none,
$message-help-icon-content
);
Expand All @@ -212,6 +226,7 @@
$message-help-color-icon-toast,
$message-help-color-bg-toast,
$message-help-color-border-toast,
$message-border-radius-toast,
$message-shadow-toast,
$message-help-icon-content
);
Expand All @@ -227,6 +242,7 @@
$message-loading-color-icon-inline,
$message-loading-color-bg-inline,
$message-loading-color-border-inline,
$message-border-radius,
none,
$message-loading-icon-content
);
Expand All @@ -239,6 +255,7 @@
$message-loading-color-icon-addon,
transparent,
transparent,
$message-border-radius,
none,
$message-loading-icon-content
);
Expand All @@ -251,6 +268,7 @@
$message-loading-color-icon-toast,
$message-loading-color-bg-toast,
$message-loading-color-border-toast,
$message-border-radius-toast,
$message-shadow-toast,
$message-loading-icon-content
);
Expand Down Expand Up @@ -287,14 +305,6 @@
top: $message-size-m-close-top;
right: $message-size-m-close-right;
}

&.#{$css-prefix}inline {
border-radius: $message-size-m-border-radius;
}

&.#{$css-prefix}toast {
border-radius: $message-size-m-border-radius-toast;
}
}

&.#{$css-prefix}large {
Expand Down Expand Up @@ -329,14 +339,6 @@
top: $message-size-l-close-top;
right: $message-size-l-close-right;
}

&.#{$css-prefix}inline {
border-radius: $message-size-l-border-radius;
}

&.#{$css-prefix}toast {
border-radius: $message-size-l-border-radius-toast;
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/message/scss/mixin.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@
$iconColor,
$bgColor,
$borderColor,
$corner,
$shadow,
$icon
) {
background-color: $bgColor;
border-color: $borderColor;
border-radius: $corner;
box-shadow: $shadow;

.#{$css-prefix}message-title {
Expand Down
16 changes: 5 additions & 11 deletions src/message/scss/variable.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,14 @@ $message-close-icon-size: $icon-xs;
// ----------------------------------------

/// corner
/// @namespace size/bounding
$message-size-l-border-radius: $corner-1 !default;
/// corner
/// @namespace size/bounding
$message-size-m-border-radius: $corner-1 !default;
/// corner
/// @namespace size/bounding
$message-size-l-border-radius-toast: $corner-1 !default;
/// corner
/// @namespace size/bounding
$message-size-m-border-radius-toast: $corner-1 !default;
/// @namespace statement/normal/bounding
$message-border-radius: $corner-1 !default;
/// border style
/// @namespace statement/normal/bounding
$message-border-style: $line-solid !default;
/// corner
/// @namespace statement/normal/bounding
$message-border-radius-toast: $corner-1 !default;
/// border style
/// @namespace statement/normal/bounding
$message-border-style-toast: $line-solid !default;
Expand Down

0 comments on commit cdcb79f

Please sign in to comment.