Browse Source

More styling.

pull/719/head
Sebastian 5 years ago
parent
commit
5e1dcac6ac
  1. 2
      backend/src/Squidex/Areas/Api/Controllers/Apps/Models/ClientsDto.cs
  2. 6
      backend/src/Squidex/Areas/IdentityServer/Views/Account/Consent.cshtml
  3. 34
      backend/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
  4. 12
      frontend/app/theme/_static.scss

2
backend/src/Squidex/Areas/Api/Controllers/Apps/Models/ClientsDto.cs

@ -30,7 +30,7 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models
.ToArray()
};
return result;
return result.CreateLinks(resources);
}
private ClientsDto CreateLinks(Resources resources)

6
backend/src/Squidex/Areas/IdentityServer/Views/Account/Consent.cshtml

@ -15,7 +15,7 @@
<h2>@T.Get("users.consent.headline")</h2>
<label for="consentToAutomatedEmails">
<div class="card profile-section-sm @ErrorClass("ConsentToAutomatedEmails")">
<div class="card card-consent @ErrorClass("ConsentToAutomatedEmails")">
<div class="card-body">
<h4 class="card-title">@T.Get("users.consent.emailHeadline")</h4>
@ -32,7 +32,7 @@
</label>
<label for="consentToCookies">
<div class="card profile-section-sm @ErrorClass("ConsentToCookies")">
<div class="card card-consent @ErrorClass("ConsentToCookies")">
<div class="card-body">
<h4 class="card-title">@T.Get("users.consent.cookiesHeadline")</h4>
@ -49,7 +49,7 @@
</label>
<label for="consentToPersonalInformation">
<div class="card profile-section-sm @ErrorClass("ConsentToPersonalInformation")">
<div class="card card-consent @ErrorClass("ConsentToPersonalInformation")">
<div class="card-body">
<h4 class="card-title">@T.Get("users.consent.piiHeadline")</h4>

34
backend/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml

@ -6,7 +6,8 @@
ViewBag.Title = action;
}
<div class="container">
<div class="login-container">
<div class="container">
<div class="row text-center">
<div class="btn-group profile-headline">
@if (Model.IsLogin)
@ -27,9 +28,9 @@
}
</div>
</div>
</div>
</div>
<form asp-controller="Account" asp-action="External" asp-route-returnurl="@Model.ReturnUrl" method="post">
<form asp-controller="Account" asp-action="External" asp-route-returnurl="@Model.ReturnUrl" method="post">
@foreach (var provider in Model.ExternalProviders)
{
var schema = provider.AuthenticationScheme.ToLowerInvariant();
@ -40,17 +41,17 @@
</button>
</div>
}
</form>
</form>
@if (Model.HasExternalLogin && Model.HasPasswordAuth)
{
@if (Model.HasExternalLogin && Model.HasPasswordAuth)
{
<div class="profile-separator">
<div class="profile-separator-text">@T.Get("users.login.separator")</div>
</div>
}
}
@if (Model.HasPasswordAuth)
{
@if (Model.HasPasswordAuth)
{
if (Model.IsLogin)
{
if (Model.IsFailed)
@ -74,10 +75,10 @@
{
<div class="profile-password-signup text-center">@T.Get("users.login.askAdmin")</div>
}
}
}
@if (Model.IsLogin)
{
@if (Model.IsLogin)
{
<p class="profile-footer">
@T.Get("users.login.noAccountSignupQuestion")
@ -85,9 +86,9 @@
@T.Get("users.login.noAccountSignupAction")
</a>
</p>
}
else
{
}
else
{
<p class="profile-footer">
@T.Get("users.login.noAccountLoginQuestion")
@ -95,4 +96,5 @@ else
@T.Get("users.login.noAccountLoginAction")
</a>
</p>
}
}
</div>

12
frontend/app/theme/_static.scss

@ -36,7 +36,7 @@ noscript {
.profile {
&-container {
margin: 0 auto;
max-width: 30rem;
max-width: 40rem;
min-width: 10rem;
padding: 1rem 2rem;
}
@ -156,6 +156,12 @@ noscript {
}
}
.login-container {
max-width: 20rem;
margin-left: auto;
margin-right: auto;
}
//
// Splash text for loader.
//
@ -172,6 +178,10 @@ noscript {
}
}
.card-consent {
border-color: transparent;
}
//
// Loader element.
//

Loading…
Cancel
Save