Merge remote-tracking branch 'origin/feature-201802-wangcz' into feature-201802-wangcz

src/main/webapp/WEB-INF/views/normal/index.html

@@ -44,7 +44,7 @@
 					</div>
 				</ul>
 				<div id="home-headerName">
-					<a ui-sref="approvalflow.enterprise"><span ng-bind="userInfo.enterprise.enName"></span> <i ng-if="userInfo.enSelect.length !== 0" class="fa fa-chevron-down"></i></a>
+					<a ui-sref="approvalflow.enterprise"><span ng-bind="userInfo.enterprise.enName"></span> <i ng-if="userInfo.enSelect.length !== 0" class="fa fa-angle-down"></i></a>
 				</div>
 				<div class="name-tk">
 					<div>
@@ -58,7 +58,7 @@
 					</div>
 				</div>
 				<div id="home-headerBtns" ng-controller="HeaderCtrl">
-					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><i class="fa fa-user fa-lg"></i><span ng-bind="userInfo.userName"></span><i class="fa fa-chevron-down"></i></a>
+					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><img src="static/img/home/user.png" alt="" style="margin-right: 5px;"/><span ng-bind="userInfo.userName"></span><i class="fa fa-angle-down"></i></a>
 				</div>
 				<div class="user-tk">
 					<div>

src/main/webapp/resources/css/index.css

@@ -794,7 +794,7 @@ ul>li.item-link>a {
 	text-align: right;
 	display:inline-block;
 	width:100%;
-	font-size: 18px;
+	font-size: 16px;
 	color: #fff;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -804,7 +804,7 @@ ul>li.item-link>a {
 	position:absolute;
 	top:15px;
 	right:0;
-	font-size: 18px;
+	font-size: 21px;
 	color: #fff;
 }
 
@@ -820,15 +820,15 @@ ul>li.item-link>a {
 	font-size: 18px;
 }
 #home-headerBtns i {
-	padding:0 10px;
+	margin-left: 5px;
 	color: #fff;
-	font-size: 20px;
+	font-size: 21px;
 }
 #home-headerBtns a{
 	display: inline-block;
 }
 #home-headerBtns a:first-child span{
-	font-size: 18px;
+	font-size: 16px;
 	color: #fff;
 	font-weight: bold;
 }
@@ -836,10 +836,10 @@ ul>li.item-link>a {
 	 color: #fff;
  }
 #home-headerBtns a:first-child:hover span{
-	color: #d32526
+	color: #fff
 }
 #home-headerBtns a:hover i.fa-user{
-	color: #d32526;
+	color: #fff;
 }
 
 #home-headerBtns a span{