Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Jinan_project

src/app/pages/login/login.component.scss

@@ -34,7 +34,7 @@
   border-radius: 4px;
   margin-left: 30px;
   width: 408px;
-  height: 504px;
+  height: 464px;
   box-sizing: border-box;
   padding: 40px 45px 42px 45px;
   color: #3b3b3b;
@@ -71,7 +71,7 @@ label {
 }
 
 button {
-  margin: 40px 0;
+  margin: 30px 0;
   width: 100%;
   height: 42px;
   font-size: 16px;
@@ -91,7 +91,7 @@ p {
 
 .company {
   color: #666262;
-  margin-top: 25px;
+  margin-top: 10px;
   font-size: 14px;
 }