Commit dce395f1 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent 309cbc76
......@@ -267,3 +267,12 @@ a,a:hover,a:link {
color: #34bf49;
padding-bottom: 20px;
}
@media (max-width: 767px) {
.logo {
margin-left: 15px;
}
.yun-login-btn {
margin-right: 15px;
}
}
......@@ -845,6 +845,9 @@ a,a:hover,a:link {
.avatar {
padding-right: 15px;
}
.yun-login-btn {
padding-right: 15px;
}
}
/*分享样式修改*/
......
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