From 721bfaa6a1cf9bed6cf416cba077284643271fee Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 11 九月 2023 18:33:50 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/common/css/lib.css |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/minipro_standard/common/css/lib.css b/minipro_standard/common/css/lib.css
index 3de5db6..3246452 100644
--- a/minipro_standard/common/css/lib.css
+++ b/minipro_standard/common/css/lib.css
@@ -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