Commit 2407105a 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 1ba03ac0
...@@ -36,7 +36,7 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -36,7 +36,7 @@ $baseUrl = \yii\helpers\Url::base();
<div class="parallelogram2"></div> <div class="parallelogram2"></div>
<div class="parallelogram3"></div> <div class="parallelogram3"></div>
</div> </div>
<div class="logo-text pull-right">云涯</div> <div class="logo-text pull-left">云涯</div>
</a> </a>
</div> </div>
<!-- <!--
......
...@@ -25,7 +25,7 @@ a,a:hover,a:link { ...@@ -25,7 +25,7 @@ a,a:hover,a:link {
.logo-home a { .logo-home a {
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
color: #107fbd; color: #333;
vertical-align: top; vertical-align: top;
} }
.yun-login-btn { .yun-login-btn {
......
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