Browse Source

Pull request #1454: 无JIRA任务 整理一下

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '155f0e1c88c0db165530f97e8cd1a6dd1fa65418':
  bugfix
es6
guy 4 years ago
parent
commit
440dfc15f2
  1. 25
      src/less/core/wrapper/flex.horizontal.less
  2. 25
      src/less/core/wrapper/flex.vertical.less

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

@ -55,6 +55,7 @@
-o-align-items: center;
align-items: center;
}
&.v-bottom {
/* 09版 */
-webkit-box-align: flex-end;
@ -66,6 +67,7 @@
-o-align-items: flex-end;
align-items: flex-end;
}
&.v-stretch {
/* 09版 */
-webkit-box-align: stretch;
@ -78,6 +80,27 @@
align-items: stretch;
}
&.h-center {
/* 09版 */
-webkit-box-pack: center;
/* 12版 */
-webkit-justify-content: center;
-moz-justify-content: center;
-ms-justify-content: center;
-o-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
&.h-right {
/* 12版 */
-webkit-flex-direction: row-reverse;
-moz-flex-direction: row-reverse;
-ms-flex-direction: row-reverse;
-o-flex-direction: row-reverse;
flex-direction: row-reverse;
}
&.h-stretch {
/* 09版 */
-webkit-box-orient: vertical;
@ -107,4 +130,4 @@
-o-align-items: stretch;
align-items: stretch;
}
}
}

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

@ -55,6 +55,7 @@
-o-align-items: center;
align-items: center;
}
&.h-right {
/* 09版 */
-webkit-box-align: flex-end;
@ -66,6 +67,7 @@
-o-align-items: flex-end;
align-items: flex-end;
}
&.h-stretch {
/* 09版 */
-webkit-box-align: stretch;
@ -78,6 +80,27 @@
align-items: stretch;
}
&.v-middle {
/* 09版 */
-webkit-box-pack: center;
/* 12版 */
-webkit-justify-content: center;
-moz-justify-content: center;
-ms-justify-content: center;
-o-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
&.v-bottom {
/* 12版 */
-webkit-flex-direction: column-reverse;
-moz-flex-direction: column-reverse;
-ms-flex-direction: column-reverse;
-o-flex-direction: column-reverse;
flex-direction: column-reverse;
}
&.v-stretch {
/* 09版 */
-webkit-box-orient: horizontal;
@ -107,4 +130,4 @@
-o-align-items: stretch;
align-items: stretch;
}
}
}

Loading…
Cancel
Save