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

@@ -154,11 +154,11 @@ a{text-decoration:none;outline:none;}
     z-index: 998;
 }
 .openBgDiv{
-	background: rgba(0,0,0,0.6); 
-    position: fixed; 
-    left: 0px; 
-    top: 0px; 
-    width: 100%; 
+	background: rgba(0,0,0,0.6);
+    position: fixed;
+    left: 0px;
+    top: 0px;
+    width: 100%;
     height: 100%;
     z-index: 997;
 }
@@ -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;
@@ -583,12 +583,12 @@ a{text-decoration:none;outline:none;}
   	z-index: 999999;
 	top:50%;
 	left:50%;
-	transform: translate(-50%,-50%); 
-    -ms-transform: translate(-50%,-50%); 
-    -moz-transform: translate(-50%,-50%); 
-    -webkit-transform: translate(-50%,-50%); 
+	transform: translate(-50%,-50%);
+    -ms-transform: translate(-50%,-50%);
+    -moz-transform: translate(-50%,-50%);
+    -webkit-transform: translate(-50%,-50%);
 }
- 
+
 .spinner > div {
   background-color: $loadingbarcolor;
   height: 100%;
@@ -598,31 +598,31 @@ a{text-decoration:none;outline:none;}
      -moz-animation: stretchdelay 1.2s infinite ease-in-out;
           animation: stretchdelay 1.2s infinite ease-in-out;
 }
- 
+
 .spinner .rect2 {
   -webkit-animation-delay: -1.1s;
      -moz-animation-delay: -1.1s;
           animation-delay: -1.1s;
 }
- 
+
 .spinner .rect3 {
   -webkit-animation-delay: -1.0s;
      -moz-animation-delay: -1.0s;
           animation-delay: -1.0s;
 }
- 
+
 .spinner .rect4 {
   -webkit-animation-delay: -0.9s;
      -moz-animation-delay: -0.9s;
           animation-delay: -0.9s;
 }
- 
+
 .spinner .rect5 {
   -webkit-animation-delay: -0.8s;
      -moz-animation-delay: -0.8s;
           animation-delay: -0.8s;
 }
- 
+
 @-webkit-keyframes stretchdelay {
   0%, 40%, 100% {
     transform: scaleY(0.4);
@@ -633,7 +633,7 @@ a{text-decoration:none;outline:none;}
     -webkit-transform: scaleY(1.0);
   }
 }
- 
+
 @-moz-keyframes stretchdelay {
   0%, 40%, 100% {
     -moz-transform: scaleY(0.4);
@@ -646,7 +646,7 @@ a{text-decoration:none;outline:none;}
     -webkit-transform: scaleY(1.0);
   }
 }
- 
+
 @keyframes stretchdelay {
   0%, 40%, 100% {
     -moz-transform: scaleY(0.4);
@@ -658,4 +658,4 @@ a{text-decoration:none;outline:none;}
          transform: scaleY(1.0);
     -webkit-transform: scaleY(1.0);
   }
-}
+}
\ No newline at end of file

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;