Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-13 09:40:27 +08:00
13 changed files with 63 additions and 29 deletions
+4 -2
View File
@@ -160,8 +160,10 @@
}
&__icon + &__text,
&__loading + &__text {
margin-left: 5px;
&__loading + &__text,
&__text + &__icon,
&__text + &__loading {
margin-left: @padding-base;
}
&--hairline {