From ea87c908fb6cdfc3e227a584a53e6730efb8262a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:41:12 +0800
Subject: [PATCH] 小程序代码
---
minipro_standard/common/css/lib.css | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/minipro_standard/common/css/lib.css b/minipro_standard/common/css/lib.css
index bd9f91d..3246452 100644
--- a/minipro_standard/common/css/lib.css
+++ b/minipro_standard/common/css/lib.css
@@ -95,7 +95,7 @@
.sbtn_black_rim{ color: #333; border-color:#eee; }
.sbtn_gray_rim{ color: #999; border-color:#ccc; }
/* flex */
-.flex{ display: flex !important;}
+.flex{ display: flex;}
.cXY{ display: flex; align-items: center;justify-content: center;}
.cY{ display: flex; align-items: center;}
.cX{display: flex; justify-content: center}
@@ -114,13 +114,24 @@
.shadowA{box-shadow: 0 0 5rpx 0 #ddd;}
.shadowB{ position: relative;}
.shadowB::after{ content: ""; display: block; width: 100%; height: 8rpx; box-shadow: 0 6rpx 12rpx rgba(0,0,0,.08); top: -8rpx; left: 0; position: absolute; }
+<<<<<<< HEAD
+=======
.rp { position: relative; }
.ap { position: absolute; }
-.orange{ color: #EA531B !important;}
-.yellow{ color: #F5A400 !important;}.bg_yellow{background-color: #F5A400}
-.green{ color: #00BF97 !important;}.bg_green{background-color: #00BF97}
+.orange{ color: #EA531B;}
+.green{ color: #65C35D;}
+.blue{ color: #3C77DA;}
+.red{ color: #f00;}
+.white{ color: #fff;}
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+
+.rp { position: relative; }
+.ap { position: absolute; }
+
+.orange{ color: #EA531B !important;}
+.green{ color: #65C35D !important;}
.blue{ color: #3C77DA !important;}
.red{ color: #f00 !important;}
.white{ color: #fff !important;}
@@ -129,7 +140,7 @@
.wc{color:#F98107 !important;}
.cm {color: #305ED5}
-.c1{color: #111!important;}.c2{color: #222!important;}.c3{ color: #333!important;}.c6{ color: #666!important;}.cc{ color: #ccc!important;}.cf{ color: #fff!important;}
+.c1{color: #111}.c2{color: #222}.c3{ color: #333;}.c6{ color: #666;}.cc{ color: #ccc;}.cf{ color: #fff;}
/* /deep/ .uicon-close .u-icon--right{ position: absolute; right: 30rpx; top: 30rpx; z-index: 999;} */
.popCloseBtn{ position: absolute; width:50rpx; height:50rpx; right: 20rpx; top: 20rpx;}
.fixedTL{ position: absolute; left: 0; top: 0;}
--
Gitblit v1.9.3