Merge branch 'newVersion_forge' into dev_devOps

# Conflicts:
#	src/forge/Images/banner_list_old.png
#	src/forge/Main/list.css
This commit is contained in:
caishi 2020-09-08 14:37:05 +08:00
commit 15bd20122a
3 changed files with 2 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

View File

@ -208,8 +208,8 @@
/* -----------详情------------ */
.detailHeader-wrapper{
background:linear-gradient(82deg,rgba(82,91,215,1) 0%,rgba(34,24,171,1) 100%);
/* background: url(../Images/forgeBanner.png) no-repeat center;
background-size:cover; */
background: url(../Images/forgeBanner.jpg) no-repeat center;
background-size:cover;
}
.headerMenu-wrapper{
font-size: 16px;