From 1be7701da06be79130a2849e4c26c4336aa1a602 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 21 Mar 2018 13:03:53 -0400 Subject: [PATCH] bootstrap 4 layout --- src/Admin/Views/Shared/Error.cshtml | 12 ++-------- src/Admin/Views/Shared/_Layout.cshtml | 29 ++++++++++++++++++++++++- src/Billing/Views/Shared/_Layout.cshtml | 2 ++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/Admin/Views/Shared/Error.cshtml b/src/Admin/Views/Shared/Error.cshtml index 086796acfc..1ea7c5ff8f 100644 --- a/src/Admin/Views/Shared/Error.cshtml +++ b/src/Admin/Views/Shared/Error.cshtml @@ -3,8 +3,8 @@ ViewData["Title"] = "Error"; } -

Error.

-

An error occurred while processing your request.

+

Error

+

An error occurred while processing your request.

@if(Model.ShowRequestId) { @@ -12,11 +12,3 @@ Request ID: @Model.RequestId

} - -

Development Mode

-

- Swapping to Development environment will display more detailed information about the error that occurred. -

-

- Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. -

diff --git a/src/Admin/Views/Shared/_Layout.cshtml b/src/Admin/Views/Shared/_Layout.cshtml index f2cbc0ae0c..9870f1632e 100644 --- a/src/Admin/Views/Shared/_Layout.cshtml +++ b/src/Admin/Views/Shared/_Layout.cshtml @@ -5,6 +5,11 @@ @ViewData["Title"] - Bitwarden Admin Portal + + + @@ -13,7 +18,29 @@ - @RenderBody() + + +
+ @RenderBody() +
diff --git a/src/Billing/Views/Shared/_Layout.cshtml b/src/Billing/Views/Shared/_Layout.cshtml index d2470ff1df..ff49126012 100644 --- a/src/Billing/Views/Shared/_Layout.cshtml +++ b/src/Billing/Views/Shared/_Layout.cshtml @@ -35,5 +35,7 @@
@RenderBody()
+ + @RenderSection("Scripts", required: false)