Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/websrc/index.html

@@ -84,7 +84,8 @@
         <div class="header">
             <div class="leftHeader">
                 <a href="javascript:void(0)">
-                  <div class="iconfont icon-logo"></div>
+                  <!-- <div class="iconfont icon-logo"></div> -->
+                  <div class="logimg"></div>
                 </a>
             </div>
             <div class="rightHeader clearfix">

src/main/websrc/styles/login.scss

@@ -372,7 +372,7 @@ a{text-decoration:none;outline:none;}
 .logo{
 	width:224px;
 	height:48px;
-	background:url(../images/logo1.png) no-repeat center center;
+	background:url(../images/logo.png) no-repeat center center;
 	margin:0 auto;
 	display: block;
 	cursor: pointer;

src/main/websrc/styles/style.scss

@@ -253,13 +253,13 @@ ul li .darklabel,.darklabel{color:$darkfontcolor;}
 	float:left;
 }
 .leftHeader .logimg{
-	width:120px;
+	width:100px;
 	height:24px;
 	cursor: pointer;
-	margin-left:16px;
+	// margin-left:16px;
 	margin-top:11px;
-	background:url(../images/logo_2_2.png) no-repeat center center;
-	background-size:100%;
+	background:url(../images/logo_.png) no-repeat center center;
+	// background-size:100%;
 }
 .appicon{
 	@extend .myicon;