From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
minipro_standard/uni_modules/uview-ui/libs/css/flex.scss | 514 ++++++++++++++++++++++++++++----------------------------
1 files changed, 257 insertions(+), 257 deletions(-)
diff --git a/minipro_standard/uni_modules/uview-ui/libs/css/flex.scss b/minipro_standard/uni_modules/uview-ui/libs/css/flex.scss
index e6544b0..6d61be9 100644
--- a/minipro_standard/uni_modules/uview-ui/libs/css/flex.scss
+++ b/minipro_standard/uni_modules/uview-ui/libs/css/flex.scss
@@ -1,257 +1,257 @@
-// .u-flex {
-// @include vue-flex(row);
-// }
-
-// .u-flex-x {
-// @include vue-flex(row);
-// }
-
-// .u-flex-y {
-// @include vue-flex(column);
-// }
-
-// .u-flex-xy-center {
-// @include vue-flex(row);
-// justify-content: center;
-// align-items: center;
-// }
-
-// .u-flex-x-center {
-// @include vue-flex(row);
-// justify-content: center;
-// }
-
-// .u-flex-y-center {
-// @include vue-flex(column);
-// justify-content: center;
-// }
-
-
-// flex甯冨眬
-.u-flex,
-.u-flex-row,
-.u-flex-x {
- @include flex;
-}
-
-.u-flex-y,
-.u-flex-column {
- @include flex(column);
-}
-
-.u-flex-x-center {
- @include flex;
- justify-content: center;
-}
-
-.u-flex-xy-center {
- @include flex;
- justify-content: center;
- align-items: center;
-}
-
-.u-flex-y-center {
- @include flex;
- align-items: center;
-}
-
-.u-flex-x-left {
- @include flex;
-}
-
-.u-flex-x-reverse,
-.u-flex-row-reverse {
- flex-direction: row-reverse;
-}
-
-.u-flex-y-reverse,
-.u-flex-column-reverse {
- flex-direction: column-reverse;
-}
-
-/* #ifndef APP-NVUE */
-// 姝ゅ涓簐ue鐗堟湰鐨勭畝鍐欙紝鍥犱负nvue涓嶆敮鎸佸悓鏃朵綔鐢ㄤ簬涓や釜绫诲悕鐨勬牱寮忓啓娉�
-// nvue涓嬪彧鑳藉啓鎴恈lass="u-flex-x u-flex-x-reverse鐨勫舰寮�"
-.u-flex.u-flex-reverse,
-.u-flex-row.u-flex-reverse,
-.u-flex-x.u-flex-reverse {
- flex-direction: row-reverse;
-}
-
-.u-flex-column.u-flex-reverse,
-.u-flex-y.u-flex-reverse {
- flex-direction: column-reverse;
-}
-
-// 鑷姩浼哥缉
-.u-flex-fill {
- flex: 1 1 auto
-}
-
-// 杈圭晫鑷姩浼哥缉
-.u-margin-top-auto,
-.u-m-t-auto {
- margin-top: auto !important
-}
-
-.u-margin-right-auto,
-.u-m-r-auto {
- margin-right: auto !important
-}
-
-.u-margin-bottom-auto,
-.u-m-b-auto {
- margin-bottom: auto !important
-}
-
-.u-margin-left-auto,
-.u-m-l-auto {
- margin-left: auto !important
-}
-
-.u-margin-center-auto,
-.u-m-c-auto {
- margin-left: auto !important;
- margin-right: auto !important
-}
-
-.u-margin-middle-auto,
-.u-m-m-auto {
- margin-top: auto !important;
- margin-bottom: auto !important
-}
-/* #endif */
-
-// 鎹㈣
-.u-flex-wrap {
- flex-wrap: wrap;
-}
-
-// 鍙嶅悜鎹㈣
-.u-flex-wrap-reverse {
- flex-wrap: wrap-reverse;
-}
-
-// 涓昏酱璧风偣瀵归綈
-.u-flex-start {
- justify-content: flex-start
-}
-
-// 涓昏酱涓棿瀵归綈
-.u-flex-center {
- justify-content: center
-}
-
-// 涓昏酱缁堢偣瀵归綈
-.u-flex-end {
- justify-content: flex-end
-}
-
-// 涓昏酱绛夋瘮闂磋窛
-.u-flex-between {
- justify-content: space-between
-}
-
-// 涓昏酱鍧囧垎闂磋窛
-.u-flex-around {
- justify-content: space-around
-}
-
-// 浜ゅ弶杞磋捣鐐瑰榻�
-.u-flex-items-start {
- align-items: flex-start
-}
-
-// 浜ゅ弶杞翠腑闂村榻�
-.u-flex-items-center {
- align-items: center
-}
-
-// 浜ゅ弶杞寸粓鐐瑰榻�
-.u-flex-items-end {
- align-items: flex-end
-}
-
-// 浜ゅ弶杞寸涓�琛屾枃瀛楀熀绾垮榻�
-.u-flex-items-baseline {
- align-items: baseline
-}
-
-// 浜ゅ弶杞存柟鍚戞媺浼稿榻�
-.u-flex-items-stretch {
- align-items: stretch
-}
-
-
-// 浠ヤ笅灞炰簬椤圭洰(瀛愬厓绱�)鐨勭被
-
-// 瀛愬厓绱犱氦鍙夎酱璧风偣瀵归綈
-.u-flex-self-start {
- align-self: flex-start
-}
-
-// 瀛愬厓绱犱氦鍙夎酱灞呬腑瀵归綈
-.u-flex-self-center {
- align-self: center
-}
-
-// 瀛愬厓绱犱氦鍙夎酱缁堢偣瀵归綈
-.u-flex-self-end {
- align-self: flex-end
-}
-
-// 瀛愬厓绱犱氦鍙夎酱绗竴琛屾枃瀛楀熀绾垮榻�
-.u-flex-self-baseline {
- align-self: baseline
-}
-
-// 瀛愬厓绱犱氦鍙夎酱鏂瑰悜鎷変几瀵归綈
-.u-flex-self-stretch {
- align-self: stretch
-}
-
-// 澶氳酱浜ゅ弶鏃剁殑瀵归綈鏂瑰紡
-
-// 璧风偣瀵归綈
-.u-flex-content-start {
- align-content: flex-start
-}
-
-// 灞呬腑瀵归綈
-.u-flex-content-center {
- align-content: center
-}
-
-// 缁堢偣瀵归綈
-.u-flex-content-end {
- align-content: flex-end
-}
-
-// 涓ょ瀵归綈
-.u-flex-content-between {
- align-content: space-between
-}
-
-// 鍧囧垎闂磋窛
-.u-flex-content-around {
- align-content: space-around
-}
-
-// 鍏ㄩ儴灞呬腑瀵归綈
-.u-flex-middle {
- justify-content: center;
- align-items: center;
- align-self: center;
- align-content: center
-}
-
-// 鏄惁鍙互鏀惧ぇ
-.u-flex-grow {
- flex-grow: 1
-}
-
-// 鏄惁鍙互缂╁皬
-.u-flex-shrink {
- flex-shrink: 1
-}
-
+// .u-flex {
+// @include vue-flex(row);
+// }
+
+// .u-flex-x {
+// @include vue-flex(row);
+// }
+
+// .u-flex-y {
+// @include vue-flex(column);
+// }
+
+// .u-flex-xy-center {
+// @include vue-flex(row);
+// justify-content: center;
+// align-items: center;
+// }
+
+// .u-flex-x-center {
+// @include vue-flex(row);
+// justify-content: center;
+// }
+
+// .u-flex-y-center {
+// @include vue-flex(column);
+// justify-content: center;
+// }
+
+
+// flex甯冨眬
+.u-flex,
+.u-flex-row,
+.u-flex-x {
+ @include flex;
+}
+
+.u-flex-y,
+.u-flex-column {
+ @include flex(column);
+}
+
+.u-flex-x-center {
+ @include flex;
+ justify-content: center;
+}
+
+.u-flex-xy-center {
+ @include flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.u-flex-y-center {
+ @include flex;
+ align-items: center;
+}
+
+.u-flex-x-left {
+ @include flex;
+}
+
+.u-flex-x-reverse,
+.u-flex-row-reverse {
+ flex-direction: row-reverse;
+}
+
+.u-flex-y-reverse,
+.u-flex-column-reverse {
+ flex-direction: column-reverse;
+}
+
+/* #ifndef APP-NVUE */
+// 姝ゅ涓簐ue鐗堟湰鐨勭畝鍐欙紝鍥犱负nvue涓嶆敮鎸佸悓鏃朵綔鐢ㄤ簬涓や釜绫诲悕鐨勬牱寮忓啓娉�
+// nvue涓嬪彧鑳藉啓鎴恈lass="u-flex-x u-flex-x-reverse鐨勫舰寮�"
+.u-flex.u-flex-reverse,
+.u-flex-row.u-flex-reverse,
+.u-flex-x.u-flex-reverse {
+ flex-direction: row-reverse;
+}
+
+.u-flex-column.u-flex-reverse,
+.u-flex-y.u-flex-reverse {
+ flex-direction: column-reverse;
+}
+
+// 鑷姩浼哥缉
+.u-flex-fill {
+ flex: 1 1 auto
+}
+
+// 杈圭晫鑷姩浼哥缉
+.u-margin-top-auto,
+.u-m-t-auto {
+ margin-top: auto !important
+}
+
+.u-margin-right-auto,
+.u-m-r-auto {
+ margin-right: auto !important
+}
+
+.u-margin-bottom-auto,
+.u-m-b-auto {
+ margin-bottom: auto !important
+}
+
+.u-margin-left-auto,
+.u-m-l-auto {
+ margin-left: auto !important
+}
+
+.u-margin-center-auto,
+.u-m-c-auto {
+ margin-left: auto !important;
+ margin-right: auto !important
+}
+
+.u-margin-middle-auto,
+.u-m-m-auto {
+ margin-top: auto !important;
+ margin-bottom: auto !important
+}
+/* #endif */
+
+// 鎹㈣
+.u-flex-wrap {
+ flex-wrap: wrap;
+}
+
+// 鍙嶅悜鎹㈣
+.u-flex-wrap-reverse {
+ flex-wrap: wrap-reverse;
+}
+
+// 涓昏酱璧风偣瀵归綈
+.u-flex-start {
+ justify-content: flex-start
+}
+
+// 涓昏酱涓棿瀵归綈
+.u-flex-center {
+ justify-content: center
+}
+
+// 涓昏酱缁堢偣瀵归綈
+.u-flex-end {
+ justify-content: flex-end
+}
+
+// 涓昏酱绛夋瘮闂磋窛
+.u-flex-between {
+ justify-content: space-between
+}
+
+// 涓昏酱鍧囧垎闂磋窛
+.u-flex-around {
+ justify-content: space-around
+}
+
+// 浜ゅ弶杞磋捣鐐瑰榻�
+.u-flex-items-start {
+ align-items: flex-start
+}
+
+// 浜ゅ弶杞翠腑闂村榻�
+.u-flex-items-center {
+ align-items: center
+}
+
+// 浜ゅ弶杞寸粓鐐瑰榻�
+.u-flex-items-end {
+ align-items: flex-end
+}
+
+// 浜ゅ弶杞寸涓�琛屾枃瀛楀熀绾垮榻�
+.u-flex-items-baseline {
+ align-items: baseline
+}
+
+// 浜ゅ弶杞存柟鍚戞媺浼稿榻�
+.u-flex-items-stretch {
+ align-items: stretch
+}
+
+
+// 浠ヤ笅灞炰簬椤圭洰(瀛愬厓绱�)鐨勭被
+
+// 瀛愬厓绱犱氦鍙夎酱璧风偣瀵归綈
+.u-flex-self-start {
+ align-self: flex-start
+}
+
+// 瀛愬厓绱犱氦鍙夎酱灞呬腑瀵归綈
+.u-flex-self-center {
+ align-self: center
+}
+
+// 瀛愬厓绱犱氦鍙夎酱缁堢偣瀵归綈
+.u-flex-self-end {
+ align-self: flex-end
+}
+
+// 瀛愬厓绱犱氦鍙夎酱绗竴琛屾枃瀛楀熀绾垮榻�
+.u-flex-self-baseline {
+ align-self: baseline
+}
+
+// 瀛愬厓绱犱氦鍙夎酱鏂瑰悜鎷変几瀵归綈
+.u-flex-self-stretch {
+ align-self: stretch
+}
+
+// 澶氳酱浜ゅ弶鏃剁殑瀵归綈鏂瑰紡
+
+// 璧风偣瀵归綈
+.u-flex-content-start {
+ align-content: flex-start
+}
+
+// 灞呬腑瀵归綈
+.u-flex-content-center {
+ align-content: center
+}
+
+// 缁堢偣瀵归綈
+.u-flex-content-end {
+ align-content: flex-end
+}
+
+// 涓ょ瀵归綈
+.u-flex-content-between {
+ align-content: space-between
+}
+
+// 鍧囧垎闂磋窛
+.u-flex-content-around {
+ align-content: space-around
+}
+
+// 鍏ㄩ儴灞呬腑瀵归綈
+.u-flex-middle {
+ justify-content: center;
+ align-items: center;
+ align-self: center;
+ align-content: center
+}
+
+// 鏄惁鍙互鏀惧ぇ
+.u-flex-grow {
+ flex-grow: 1
+}
+
+// 鏄惁鍙互缂╁皬
+.u-flex-shrink {
+ flex-shrink: 1
+}
+
--
Gitblit v1.9.3