Commit bd88e550 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 f7715ab7
...@@ -50,6 +50,13 @@ a:link,a:active,a:visited { ...@@ -50,6 +50,13 @@ a:link,a:active,a:visited {
} }
.logo a { .logo a {
display: block; display: block;
font-size: 18px;
color: #fff;
height: 60px;
line-height: 60px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.logo a img { .logo a img {
padding: 21px 0; padding: 21px 0;
......
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