From 01fa483f956e8ac73b071f5ccb8795453a6a0310 Mon Sep 17 00:00:00 2001 From: lepipele Date: Mon, 9 Apr 2018 23:12:03 -0500 Subject: [PATCH 1/2] Improving styling of Forgot password page Fixes: https://github.com/btcpayserver/btcpayserver/issues/108 --- .../Views/Account/ForgotPassword.cshtml | 44 ++++++++++++------- .../Account/ForgotPasswordConfirmation.cshtml | 20 +++++++-- 2 files changed, 46 insertions(+), 18 deletions(-) diff --git a/BTCPayServer/Views/Account/ForgotPassword.cshtml b/BTCPayServer/Views/Account/ForgotPassword.cshtml index d7997c1e1..fcc7538a9 100644 --- a/BTCPayServer/Views/Account/ForgotPassword.cshtml +++ b/BTCPayServer/Views/Account/ForgotPassword.cshtml @@ -3,23 +3,37 @@ ViewData["Title"] = "Forgot your password?"; } -

@ViewData["Title"]

-

Enter your email.

-
-
-
-
-
-
- - - +
+
+
+
+ @Html.Partial("_StatusMessage", TempData["StatusMessage"])
- - +
+
+
+

@ViewData["Title"]

+
+
+
+
+

Start password reset

+
+

+ We all forget passwords every now and then. Just provide email address tied to your account and we'll start the process of helping you recover your account. +

+
+
+ + + +
+ +
+
+
-
- + @section Scripts { @await Html.PartialAsync("_ValidationScriptsPartial") } diff --git a/BTCPayServer/Views/Account/ForgotPasswordConfirmation.cshtml b/BTCPayServer/Views/Account/ForgotPasswordConfirmation.cshtml index ef1e54ed1..a03e00f86 100644 --- a/BTCPayServer/Views/Account/ForgotPasswordConfirmation.cshtml +++ b/BTCPayServer/Views/Account/ForgotPasswordConfirmation.cshtml @@ -1,8 +1,22 @@ @{ - ViewData["Title"] = "Forgot password confirmation"; + ViewData["Title"] = "Email sent!"; } -

@ViewData["Title"]

+

- Please check your email to reset your password.

+ + +
+
+
+
+

@ViewData["Title"]

+
+

+ Please check your email to reset your password. +

+
+
+
+
From 2432834f3da40a7c62df4b919cc90003d9ef8cc9 Mon Sep 17 00:00:00 2001 From: lepipele Date: Mon, 9 Apr 2018 23:13:14 -0500 Subject: [PATCH 2/2] Updating BundleMinifier, now supporting CSS variables --- BTCPayServer/BTCPayServer.csproj | 2 +- BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index eff0b41fd..1867162fb 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -30,7 +30,7 @@ - + diff --git a/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css b/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css index 924bc165f..8a7a5cd87 100644 --- a/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css +++ b/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css @@ -4,7 +4,7 @@ * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -/*:root { +:root { --blue: #007bff; --indigo: #6610f2; --purple: #6f42c1; @@ -32,7 +32,7 @@ --breakpoint-lg: 992px; --breakpoint-xl: 1200px; --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }*/ + --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } *, *::before,