Merge pull request #171 from ryancyq/patch-5

ismcagdas · web-flow · commit b76d562d7e01 · 2018-01-03T09:47:59.000+03:00
Fixed login page styles
diff --git a/angular/src/account/account.component.less b/angular/src/account/account.component.less
@@ -10,10 +10,4 @@
     a {
         cursor: pointer;
     }
-}
-
-div#LoginArea {
-    margin-top: 0px !important;
-    max-width: 400px;
-    margin: 120px auto 10px auto;
 }
diff --git a/angular/src/account/login/login.component.html b/angular/src/account/login/login.component.html
@@ -1,4 +1,4 @@
-﻿<div class="card" [@routerTransition]>
+﻿<div class="card" id="LoginArea" [@routerTransition]>
     <div #cardBody class="body">
         <form #loginForm="ngForm" id="LoginForm" method="post" novalidate (ngSubmit)="login()">
             <h4 class="text-center">{{l("LogIn")}}</h4>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Login.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/Login.cshtml
@@ -23,7 +23,7 @@
         <script src="~/view-resources/Views/Account/Login.min.js" asp-append-version="true"></script>
     </environment>
 }
-<div class="card">
+<div class="card" id="﻿LoginArea">
     <div class="body">
         <form id="LoginForm" asp-action="Login" method="post">
             <input type="hidden" name="returnUrl" value="@Model.ReturnUrl" />
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.css
@@ -1,8 +1,4 @@
-﻿#LoginArea {
-  max-width: 400px;
-  margin: 120px auto 10px auto;
-}
-.social-icons {
+﻿.social-icons {
   padding-left: 0px;
 }
 .social-icons a.btn-sm {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.less b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.less
@@ -1,9 +1,4 @@
-﻿#LoginArea {
-    max-width: 400px;
-    margin: 120px auto 10px auto;
-}
-
-.social-icons {
+﻿.social-icons {
     padding-left: 0px;
 
     a.btn-sm {

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,4 @@`
`10`	`10`	`a {`
`11`	`11`	`cursor: pointer;`
`12`	`12`	`}`
`13`		`-}`
`14`		`-`
`15`		`-div#LoginArea {`
`16`		`- margin-top: 0px !important;`
`17`		`- max-width: 400px;`
`18`		`- margin: 120px auto 10px auto;`
`19`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="card" [@routerTransition]>`
	`1`	`+<div class="card" id="LoginArea" [@routerTransition]>`
`2`	`2`	`<div #cardBody class="body">`
`3`	`3`	`<form #loginForm="ngForm" id="LoginForm" method="post" novalidate (ngSubmit)="login()">`
`4`	`4`	`<h4 class="text-center">{{l("LogIn")}}</h4>`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`<script src="~/view-resources/Views/Account/Login.min.js" asp-append-version="true"></script>`
`24`	`24`	`</environment>`
`25`	`25`	`}`
`26`		`-<div class="card">`
	`26`	`+<div class="card" id="LoginArea">`
`27`	`27`	`<div class="body">`
`28`	`28`	`<form id="LoginForm" asp-action="Login" method="post">`
`29`	`29`	`<input type="hidden" name="returnUrl" value="@Model.ReturnUrl" />`