From 65c8026eaeff3d769a1d168933e13035708233e0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 10:00:48 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/index.less | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 859eec0..fffb0e8 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -89,6 +89,11 @@
margin-right: 4px;
margin-top: -5px;
}
+
+ &-register {
+ width: 12px;
+ margin-left: 4px;
+ }
}
.dataSync {
@@ -96,7 +101,7 @@
&-page {
background-color: #fff;
- margin: 8px 8px 0px 16px;
+ margin: 0px 8px 0px 16px;
padding: 12px 16px 16px 16px;
height: calc(100vh - 228px);
overflow-y: scroll;
@@ -140,6 +145,16 @@
.scrollTabContent {
overflow-y: scroll;
+ }
+ }
+
+ &-noBackTabPage {
+ margin: 0 16px 0px 16px;
+ height: calc(100vh - 219px);
+
+ .whiteBox {
+ background-color: #fff;
+ padding: 12px;
}
}
}
@@ -451,6 +466,19 @@
z-index: 9999;
}
+.myTag {
+ border: 1px solid rgb(229, 230, 235);
+ border-radius: 2px;
+ display: inline-block;
+ padding: 3px 6px;
+ cursor: pointer;
+
+ &:hover {
+ border: 1px solid #1A6FB8;
+ color: #1A6FB8;
+ }
+}
+
.gap {
height: 8px;
background-color: #F2F3F5;
--
Gitblit v1.8.0