From 8688334f0dd01fee748a805ce758eb9e0a75db48 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Mon, 20 Jul 2020 15:05:51 +0200 Subject: [PATCH] Update views dependent on simple layout --- BTCPayServer/Views/Account/Login.cshtml | 81 ++++++++--------- BTCPayServer/Views/Account/Register.cshtml | 90 ++++++++---------- BTCPayServer/Views/Error/404.cshtml | 20 +++- BTCPayServer/Views/Error/429.cshtml | 20 +++- BTCPayServer/Views/Error/500.cshtml | 20 +++- BTCPayServer/Views/Error/Handle.cshtml | 22 ++++- .../Views/Shared/_BTCPaySupporters.cshtml | 91 +++++++------------ BTCPayServer/Views/Shared/_LayoutPlain.cshtml | 84 ----------------- .../wwwroot/img/icons/onion-purple.svg | 1 + BTCPayServer/wwwroot/main/site.css | 31 +++++-- .../wwwroot/main/themes/default-dark.css | 4 + 11 files changed, 211 insertions(+), 253 deletions(-) delete mode 100644 BTCPayServer/Views/Shared/_LayoutPlain.cshtml create mode 100644 BTCPayServer/wwwroot/img/icons/onion-purple.svg diff --git a/BTCPayServer/Views/Account/Login.cshtml b/BTCPayServer/Views/Account/Login.cshtml index 5735baa87..fa3356075 100644 --- a/BTCPayServer/Views/Account/Login.cshtml +++ b/BTCPayServer/Views/Account/Login.cshtml @@ -3,38 +3,37 @@ @inject BTCPayServer.HostedServices.CssThemeManager themeManager @{ ViewData["Title"] = "Log in"; - ViewData["Headline"] = "Welcome to your BTCPay Server"; Layout = "_LayoutSimple"; } - +
+
+ + BTCPay Server + + +

Welcome to your BTCPay Server

-
- +
- - -
-
+
+
+ +
+
+ +
+
diff --git a/BTCPayServer/Views/Account/Register.cshtml b/BTCPayServer/Views/Account/Register.cshtml index d3b59fd8b..c50395687 100644 --- a/BTCPayServer/Views/Account/Register.cshtml +++ b/BTCPayServer/Views/Account/Register.cshtml @@ -2,39 +2,42 @@ @inject BTCPayServer.Services.BTCPayServerEnvironment env @{ ViewData["Title"] = "Register"; - ViewData["Headline"] = "Welcome to your BTCPay Server"; Layout = "_LayoutSimple"; } - +
+
+ + BTCPay Server + + +

Welcome to your BTCPay Server

+ +

+ A self-hosted, open-source cryptocurrency payment processor. + It is secure, private, censorship-resistant and free. +

-
- +
- - - -
-
+
+
+
+
+ +
+
+ diff --git a/BTCPayServer/Views/Error/404.cshtml b/BTCPayServer/Views/Error/404.cshtml index 0add18d44..293f3d6a5 100644 --- a/BTCPayServer/Views/Error/404.cshtml +++ b/BTCPayServer/Views/Error/404.cshtml @@ -1,8 +1,18 @@ @{ - ViewData["Headline"] = "404 - Page not found"; + ViewData["Title"] = "404 - Page not found"; } -
+
+ + BTCPay Server + + +

@ViewData["Title"]

+
+
+ +

This is like searching for a person more beautiful than Nicolas Dorier.

@@ -13,3 +23,9 @@

You can always try navigating back to home.

+ +
+
+ +
+
diff --git a/BTCPayServer/Views/Error/429.cshtml b/BTCPayServer/Views/Error/429.cshtml index 891d88148..c6d2a5602 100644 --- a/BTCPayServer/Views/Error/429.cshtml +++ b/BTCPayServer/Views/Error/429.cshtml @@ -1,8 +1,18 @@ @{ - ViewData["Headline"] = "429 - Too Many Requests"; + ViewData["Title"] = "429 - Too Many Requests"; } -
+
+ + BTCPay Server + + +

@ViewData["Title"]

+
+
+ +

Please send requests slower. Or face the wrath of Vin Diesel.

@@ -13,3 +23,9 @@

Slowly navigate back to home.

+ +
+
+ +
+
diff --git a/BTCPayServer/Views/Error/500.cshtml b/BTCPayServer/Views/Error/500.cshtml index 1c4297aeb..6717d7469 100644 --- a/BTCPayServer/Views/Error/500.cshtml +++ b/BTCPayServer/Views/Error/500.cshtml @@ -1,8 +1,18 @@ @{ - ViewData["Headline"] = "500 - Internal Server Error"; + ViewData["Title"] = "500 - Internal Server Error"; } -
+
+ + BTCPay Server + + +

@ViewData["Title"]

+
+
+ +

Whoops, something really went wrong! Mr Kukks is so sorry.

@@ -13,3 +23,9 @@

Navigate back to home.

+ +
+
+ +
+
diff --git a/BTCPayServer/Views/Error/Handle.cshtml b/BTCPayServer/Views/Error/Handle.cshtml index 025a25d5f..9e0c06ca8 100644 --- a/BTCPayServer/Views/Error/Handle.cshtml +++ b/BTCPayServer/Views/Error/Handle.cshtml @@ -1,15 +1,25 @@ @using System.Net @model int? @{ - ViewData["Headline"] = "Generic Error occurred"; + ViewData["Title"] = "Generic Error occurred"; if (Model.HasValue) { var httpCode = (HttpStatusCode)Model.Value; - ViewData["Headline"] = $"{(int)httpCode} - {httpCode.ToString()}"; + ViewData["Title"] = $"{(int)httpCode} - {httpCode.ToString()}"; } } -
+
+ + BTCPay Server + + +

@ViewData["Title"]

+
+
+ +

Generic error occurred, HTTP Code: @Model

Consult server log for more details. @@ -17,3 +27,9 @@ Navigate back to home.

+ +
+
+ +
+
diff --git a/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml b/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml index 03af2e8c3..a47594b92 100644 --- a/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml +++ b/BTCPayServer/Views/Shared/_BTCPaySupporters.cshtml @@ -1,73 +1,44 @@ - - -

- BTCPayServer Supporters - - - -

-
-
- - Sponsor Kraken +
+ Our Supporters +
+
+
+ + Sponsor Kraken + Kraken -
- Kraken -
-
- - Sponsor Square Crypto +
+ + Sponsor Square Crypto + Square Crypto -
- Square Crypto -
-
- - Sponsor BTSE +
+ + Sponsor BTSE + BTSE -
- BTSE -
-
- - Sponsor DG lab +
+ + Sponsor DG lab + DG Lab -
- DG Lab -
-
- - Sponsor OKCoin +
+ + Sponsor OKCoin + OKCoin -
- OKCoin -
-
- - Sponsor ACINQ +
+ + Sponsor ACINQ + ACINQ -
- ACINQ -
-
- View all supporters -
+

+ View all supporters +

diff --git a/BTCPayServer/Views/Shared/_LayoutPlain.cshtml b/BTCPayServer/Views/Shared/_LayoutPlain.cshtml deleted file mode 100644 index c59a38464..000000000 --- a/BTCPayServer/Views/Shared/_LayoutPlain.cshtml +++ /dev/null @@ -1,84 +0,0 @@ -@{ - Layout = null; -} - - - - - - - - - -
- -
- -
- @RenderBody() -
-
- @await Html.PartialAsync("_ValidationScriptsPartial") - - diff --git a/BTCPayServer/wwwroot/img/icons/onion-purple.svg b/BTCPayServer/wwwroot/img/icons/onion-purple.svg new file mode 100644 index 000000000..4fb6cee3d --- /dev/null +++ b/BTCPayServer/wwwroot/img/icons/onion-purple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css index 84e9933c5..1d9486758 100644 --- a/BTCPayServer/wwwroot/main/site.css +++ b/BTCPayServer/wwwroot/main/site.css @@ -195,15 +195,32 @@ pre { background: none; } -.btn-onion { - color: #fff; - background-color: #59316B; - border-color: #59316B; +.account-form { + max-width: 36em; } -.btn-onion:focus, -.btn-onion.focus { - box-shadow: 0 0 0 0.2rem #9065a1; +.btn-outline-onion { + background-image: none; + background-color: transparent; + border: 0; +} + +.btn-outline-onion:hover { + color: #fff; + background-color: #7D4698; +} + +.btn-outline-onion:focus, +.btn-outline-onion.focus { + color: #fff; + background-color: #7D4698; + box-shadow: 0 0 0 0.2rem #e6d5ee; +} + +.btn-outline-onion:hover img, +.btn-outline-onion:focus img, +.btn-outline-onion.focus img { + filter: contrast(0) brightness(200%); } [class*="field-validation"]:not(:empty) { diff --git a/BTCPayServer/wwwroot/main/themes/default-dark.css b/BTCPayServer/wwwroot/main/themes/default-dark.css index d6bf6fb11..fd3af5d5b 100644 --- a/BTCPayServer/wwwroot/main/themes/default-dark.css +++ b/BTCPayServer/wwwroot/main/themes/default-dark.css @@ -39,6 +39,10 @@ filter: none; } +.btn-outline-onion img { + filter: contrast(0) brightness(200%) !important; +} + .list-group-item-action, .list-group-item-action:hover { color: var(--btcpay-body-color);