From c5b4bf771474741fab6dc43231f76dfd1224cc26 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Tue, 23 Feb 2021 15:44:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-18319=20=E4=BF=AE=E6=94=B9less?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9FR=E7=9A=84=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/wrapper/flex.horizontal.less | 2 +- src/less/core/wrapper/flex.vertical.less | 2 +- src/less/core/wrapper/flex.wrapper.horizontal.less | 4 ++-- src/less/core/wrapper/flex.wrapper.vertical.less | 4 ++-- src/less/core/wrapper/inline.center.less | 4 ++-- src/less/core/wrapper/inline.horizontal.less | 4 ++-- src/less/core/wrapper/inline.vertical.less | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less index baec91f31..a2536dee1 100644 --- a/src/less/core/wrapper/flex.horizontal.less +++ b/src/less/core/wrapper/flex.horizontal.less @@ -28,7 +28,7 @@ flex-direction: row; } -.bi-f-h { +.bi-f-h, .bi-flex-horizontal-layout { .flex(); .horizontal(); diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less index 26fc982aa..0de23d791 100644 --- a/src/less/core/wrapper/flex.vertical.less +++ b/src/less/core/wrapper/flex.vertical.less @@ -28,7 +28,7 @@ flex-direction: row; } -.bi-f-v { +.bi-f-v, .bi-flex-vertical-layout{ .flex(); .vertical(); diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 80774e540..1142520f5 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -28,8 +28,8 @@ flex-direction: row; } -.bi-f-s-h { - & .f-s-h-w { +.bi-f-s-h, .bi-flex-scrollable-horizontal-layout { + & .f-s-h-w, & .flex-scrollable-horizontal-layout-wrapper { .flex(); .horizontal(); diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index d7e8ce6e7..1866ad2c3 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -28,8 +28,8 @@ flex-direction: row; } -.bi-f-s-v { - & .f-s-v-w { +.bi-f-s-v, .bi-flex-scrollable-vertical-layout { + & .f-s-v-w, & .flex-scrollable-vertical-layout-wrapper { .flex(); .vertical(); diff --git a/src/less/core/wrapper/inline.center.less b/src/less/core/wrapper/inline.center.less index 675269337..f49646076 100644 --- a/src/less/core/wrapper/inline.center.less +++ b/src/less/core/wrapper/inline.center.less @@ -1,4 +1,4 @@ -.bi-i-c-a { +.bi-i-c-a, .bi-inline-center-adapt-layout { &:after { display: inline-block; width: 0; @@ -7,7 +7,7 @@ content: ' '; } - & > .i-c-a-item { + & > .i-c-a-item, & > .inline-center-adapt-item { display: inline-block; &.x-icon { diff --git a/src/less/core/wrapper/inline.horizontal.less b/src/less/core/wrapper/inline.horizontal.less index faa62ae5c..7238f2019 100644 --- a/src/less/core/wrapper/inline.horizontal.less +++ b/src/less/core/wrapper/inline.horizontal.less @@ -1,4 +1,4 @@ -.bi-i-h-a { +.bi-i-h-a, .bi-inline-horizontal-adapt-layout { &:after { display: inline-block; width: 0; @@ -7,7 +7,7 @@ content: ' '; } - & > .i-h-a-item { + & > .i-h-a-item, .inline-horizontal-adapt-item { display: inline-block; &.x-icon { diff --git a/src/less/core/wrapper/inline.vertical.less b/src/less/core/wrapper/inline.vertical.less index 534ecefcb..036f5ab2e 100644 --- a/src/less/core/wrapper/inline.vertical.less +++ b/src/less/core/wrapper/inline.vertical.less @@ -1,4 +1,4 @@ -.bi-i-v-a { +.bi-i-v-a, .bi-inline-vertical-adapt-layout { &:after { display: inline-block; width: 0; @@ -7,7 +7,7 @@ content: ' '; } - & > .i-v-a-item { + & > .i-v-a-item, .inline-vertical-adapt-item { display: inline-block; &.x-icon { From eea25e512a47c15d71e3f2197f92dc659b570ec2 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Tue, 23 Feb 2021 15:56:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=BC=8F=E4=BA=86=E4=B8=A4=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/wrapper/inline.horizontal.less | 2 +- src/less/core/wrapper/inline.vertical.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/less/core/wrapper/inline.horizontal.less b/src/less/core/wrapper/inline.horizontal.less index 7238f2019..fd90fe085 100644 --- a/src/less/core/wrapper/inline.horizontal.less +++ b/src/less/core/wrapper/inline.horizontal.less @@ -7,7 +7,7 @@ content: ' '; } - & > .i-h-a-item, .inline-horizontal-adapt-item { + & > .i-h-a-item, & > .inline-horizontal-adapt-item { display: inline-block; &.x-icon { diff --git a/src/less/core/wrapper/inline.vertical.less b/src/less/core/wrapper/inline.vertical.less index 036f5ab2e..d91abf2d4 100644 --- a/src/less/core/wrapper/inline.vertical.less +++ b/src/less/core/wrapper/inline.vertical.less @@ -7,7 +7,7 @@ content: ' '; } - & > .i-v-a-item, .inline-vertical-adapt-item { + & > .i-v-a-item, & > .inline-vertical-adapt-item { display: inline-block; &.x-icon {