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

src/frontend/views/layouts/main.php

@@ -28,7 +28,7 @@ $baseUrl = \yii\helpers\Url::base();
 
 <?php if (Yii::$app->user->isGuest) : ?>
     <div class="navbar-main navbar-static-top clearfix">
-        <div id="main-logo" class="logo pull-left logo-home"><a href="<?= $baseUrl . "/user-center/" ?>"></a></div>
+        <div id="main-logo" class="logo pull-left logo-home"><a href="<?= $baseUrl . "/user-center/" ?>">云涯</a></div>
         <!--
         <ul class="c-menu-item pull-left">
             <li class="active"><a href="#">首页</a></li>

src/frontend/views/layouts/userCenter.php

@@ -11,8 +11,11 @@ $this->beginContent('@app/views/layouts/center.php');
 ?>
 
     <div class="tp-sidebar">
-        <div class="logo"><a href="<?= \yii\helpers\Url::base() ?>"><img
-                    src="<?= AppAsset::getStaticUrl('img/logo.png') ?>"></a></div>
+        <div class="logo">
+            <a href="<?= \yii\helpers\Url::base() ?>">
+                <span class="clearfix"><img src="<?= AppAsset::getStaticUrl('img/logo.png') ?>"> <b>云涯</b></span>
+            </a>
+        </div>
         <div class="side-menu">
             <!-- 左侧菜单 -->
 

src/frontend/web/css/login.css

@@ -20,9 +20,13 @@ a,a:hover,a:link {
 }
 .logo-home a {
     display: block;
-    width: 120px;
+    width: 80px;
     height: 60px;
     background: url(../img/logo_white.png) left top no-repeat;
+    font-size: 14px;
+    line-height: 60px;
+    text-indent: 35px;
+    color: #107fbd;
 }
 .yun-login-btn {
     margin-right: 30px;

src/frontend/web/css/main.css

@@ -964,9 +964,6 @@ a,a:hover,a:link {
 .video-js .vjs-play-progress {
     background-color: #f12b24!important;
 }
-.video-js .vjs-load-progress {
-
-}
 
 
 

src/frontend/web/css/style.css

@@ -86,6 +86,23 @@ a:link, a:active, a:visited {
     display: inline-block;
 }
 
+.logo a span {
+    display: inline-block;
+    height: 60px;
+}
+.logo a span img {
+    float: left;
+}
+.logo a span b {
+    float: left;
+    font-weight: normal;
+    display: inline-block;
+    height: 60px;
+    line-height: 60px;
+    color: #fff;
+    padding-left: 10px;
+}
+
 
 .accordion,
 .accordion li {