Skip to content

S
so-manage-ui
Commit 5bcb7b08 authored by 赵伟庚's avatar 赵伟庚
Browse files
Options

修改冲突

parent d5d1480b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
src/assets/css/index.css
View file @ 5bcb7b08
...@@ -1559,7 +1559,6 @@ border-radius:8px; ...@@ -1559,7 +1559,6 @@ border-radius:8px;
color: #d75138; color: #d75138;
} }
<<<<<<< HEAD
.register_btn { .register_btn {
background-color: #eff2fa; background-color: #eff2fa;
border-radius: 4px; border-radius: 4px;
...@@ -1578,7 +1577,6 @@ border-radius:8px; ...@@ -1578,7 +1577,6 @@ border-radius:8px;
padding: 20px; padding: 20px;
} }
=======
.tip-image { .tip-image {
position: absolute; position: absolute;
right: -24px; right: -24px;
...@@ -1589,4 +1587,3 @@ border-radius:8px; ...@@ -1589,4 +1587,3 @@ border-radius:8px;
background-image: url("../imgs/ic_tips.png"); background-image: url("../imgs/ic_tips.png");
background-size: contain; background-size: contain;
} }
>>>>>>> a152210490b057d5d9be08d415be67274b954aaf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment