Skip to content

任超 / js.portalStaticPage

Go to a project
Toggle navigation
Toggle navigation pinning
b299931a by 焦小希
Options

解决冲突

1 parent 0a386f87
Pipeline #19 for b299931a failed in 0 seconds
Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
......@@ -316,7 +316,6 @@ div.footer .system_service ul li a:hover {
background-color: rgba(144,147,153,.5);
}
<<<<<<< HEAD
/* 登陆样式 by jxx */
.PersonLogin{
cursor: pointer;
......@@ -383,7 +382,6 @@ div.footer .system_service ul li a:hover {
font-size: 14px;
border-radius: 4px;
}
=======
/* card样式 */
.cardItem {
background: #FFFFFF;
......@@ -395,4 +393,3 @@ div.footer .system_service ul li a:hover {
}
/* 0091FF */
>>>>>>> 11a78ef128cb77845e54d1142a289ffa8b437d14
......