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 |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/minipro_standard/common/css/lib.css b/minipro_standard/common/css/lib.css
index 10ccfdc..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,6 +114,18 @@
 .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;}
+.green{ color: #65C35D;}
+.blue{ color: #3C77DA;}
+.red{ color: #f00;}
+.white{ color: #fff;}
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
 
 .rp { position: relative; }
 .ap { position: absolute; }

--
Gitblit v1.9.3