Browse Source

Pull request #1785: CHART-18319 修改less,兼容FR的富文本

Merge in VISUAL/fineui from ~QINGHUI.LIU/fineui:master to master

* commit 'eea25e512a47c15d71e3f2197f92dc659b570ec2':
  漏了两个
  CHART-18319 修改less,兼容FR的富文本
es6
Qinghui.Liu 4 years ago
parent
commit
172b2272d5
  1. 2
      src/less/core/wrapper/flex.horizontal.less
  2. 2
      src/less/core/wrapper/flex.vertical.less
  3. 4
      src/less/core/wrapper/flex.wrapper.horizontal.less
  4. 4
      src/less/core/wrapper/flex.wrapper.vertical.less
  5. 4
      src/less/core/wrapper/inline.center.less
  6. 4
      src/less/core/wrapper/inline.horizontal.less
  7. 4
      src/less/core/wrapper/inline.vertical.less

2
src/less/core/wrapper/flex.horizontal.less

@ -28,7 +28,7 @@
flex-direction: row; flex-direction: row;
} }
.bi-f-h { .bi-f-h, .bi-flex-horizontal-layout {
.flex(); .flex();
.horizontal(); .horizontal();

2
src/less/core/wrapper/flex.vertical.less

@ -28,7 +28,7 @@
flex-direction: row; flex-direction: row;
} }
.bi-f-v { .bi-f-v, .bi-flex-vertical-layout{
.flex(); .flex();
.vertical(); .vertical();

4
src/less/core/wrapper/flex.wrapper.horizontal.less

@ -28,8 +28,8 @@
flex-direction: row; flex-direction: row;
} }
.bi-f-s-h { .bi-f-s-h, .bi-flex-scrollable-horizontal-layout {
& .f-s-h-w { & .f-s-h-w, & .flex-scrollable-horizontal-layout-wrapper {
.flex(); .flex();
.horizontal(); .horizontal();

4
src/less/core/wrapper/flex.wrapper.vertical.less

@ -28,8 +28,8 @@
flex-direction: row; flex-direction: row;
} }
.bi-f-s-v { .bi-f-s-v, .bi-flex-scrollable-vertical-layout {
& .f-s-v-w { & .f-s-v-w, & .flex-scrollable-vertical-layout-wrapper {
.flex(); .flex();
.vertical(); .vertical();

4
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 { &:after {
display: inline-block; display: inline-block;
width: 0; width: 0;
@ -7,7 +7,7 @@
content: ' '; content: ' ';
} }
& > .i-c-a-item { & > .i-c-a-item, & > .inline-center-adapt-item {
display: inline-block; display: inline-block;
&.x-icon { &.x-icon {

4
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 { &:after {
display: inline-block; display: inline-block;
width: 0; width: 0;
@ -7,7 +7,7 @@
content: ' '; content: ' ';
} }
& > .i-h-a-item { & > .i-h-a-item, & > .inline-horizontal-adapt-item {
display: inline-block; display: inline-block;
&.x-icon { &.x-icon {

4
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 { &:after {
display: inline-block; display: inline-block;
width: 0; width: 0;
@ -7,7 +7,7 @@
content: ' '; content: ' ';
} }
& > .i-v-a-item { & > .i-v-a-item, & > .inline-vertical-adapt-item {
display: inline-block; display: inline-block;
&.x-icon { &.x-icon {

Loading…
Cancel
Save