From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/index.less | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 1bc0930..38205be 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -704,7 +704,7 @@
}
.gradient-box {
- position: absolute;
+ position: fixed;
right: 0;
top: 50%;
transform: translateY(-50%);
@@ -719,6 +719,7 @@
flex: 1 1 0%;
background-color: rgb(242, 243, 245);
height: 100vh;
+ overflow-y: auto;
&-case {
display: flex;
@@ -745,20 +746,28 @@
padding: 8px 12px;
border-radius: 8px;
margin-bottom: 8px;
+ margin-right: 16px;
+ align-items: center;
+
&-type {
border: 1px solid #1A6FB8;
padding: 0px 8px;
color: #1A6FB8;
border-radius: 4px;
+ width: 79px;
+ height: 24px;
}
&-name{
margin: 0px 16px 0px 8px;
+ max-width: 828px;
+ width: fit-content;
}
&-btn{
color: #1A6FB8;
+ width: 30px;
}
}
}
@@ -786,6 +795,7 @@
&-name{
font-size: 16px;
margin-bottom: 16px;
+ max-width: 400px;
}
&-littleTitle{
--
Gitblit v1.8.0