From 1ef56b68318629e24f8e42406822059262d392b9 Mon Sep 17 00:00:00 2001
From: coder77 <2293444075@qq.com>
Date: Thu, 10 Apr 2025 11:03:25 +0800
Subject: [PATCH] Merge branch 'master_dev' of ssh://dev.zhiheiot.com:29418/mob-components into master_dev

---
 common/common.scss |   88 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/common/common.scss b/common/common.scss
index 72f151e..408d7aa 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -3,7 +3,7 @@
  * @author Tevin
  */
 
-@import "./components/common/sassMixin";
+@import "./sassMixin";
 
 .m-price {
     &::before {
@@ -12,6 +12,88 @@
     }
 }
 
-.m-mark {
-    color: #fb4242;
+// .m-mark {
+//     color: #fb4242;
+// }
+
+.m-text-stress {
+    color: $colorStress;
+}
+.m-text-success {
+    color: $colorSuccess;
+}
+.m-text-info {
+    color: $colorInfo;
+}
+.m-text-warning {
+    color: $colorWarning;
+}
+.m-text-danger {
+    color: $colorDanger;
+}
+.m-text-ignore {
+    color: $colorIgnore;
+}
+
+[class*="m-border"] {
+    border-width: 0;
+    border-style: solid;
+    &[class*="border-stress"] {
+        border-color: #d6e4ef;
+    }
+    &[class*="border-normal"] {
+        border-color: #eee;
+    }
+    &[class*="border-strong"] {
+        border-color: #e2e2e2;
+    }
+    &[class*="border-super"] {
+        border-color: #d1d1d1;
+    }
+    &[class*="stress-bottom"],
+    &[class*="normal-bottom"],
+    &[class*="strong-bottom"],
+    &[class*="super-bottom"],
+    &[class*="top-bottom"],
+    &[class*="left-bottom"],
+    &[class*="right-bottom"] {
+        border-bottom-width: 1PX;
+    }
+    &[class*="stress-top"],
+    &[class*="normal-top"],
+    &[class*="strong-top"],
+    &[class*="super-top"],
+    &[class*="left-top"],
+    &[class*="right-top"],
+    &[class*="bottom-top"] {
+        border-top-width: 1PX;
+    }
+    &[class*="stress-left"],
+    &[class*="normal-left"],
+    &[class*="strong-left"],
+    &[class*="super-left"],
+    &[class*="bottom-left"],
+    &[class*="top-left"],
+    &[class*="right-left"] {
+        border-left-width: 1PX;
+    }
+    &[class*="stress-right"],
+    &[class*="normal-right"],
+    &[class*="strong-right"],
+    &[class*="super-right"],
+    &[class*="bottom-right"],
+    &[class*="top-right"],
+    &[class*="left-right"] {
+        border-right-width: 1PX;
+    }
+    &[class*="stress-full"],
+    &[class*="normal-full"],
+    &[class*="strong-full"],
+    &[class*="super-full"],
+    &[class*="bottom-full"],
+    &[class*="top-full"],
+    &[class*="left-full"],
+    &[class*="right-full"] {
+        border-width: 1PX;
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1