Merge pull request #36 from EpicOfficer/FEATURE/WebDashboard

Minor UI tweaks
EpicOfficer · Apr 20, 2024 · 6b3bd21 · 6b3bd21
2 parents eb14293 + 3b56741
commit 6b3bd21
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 41 deletions.
diff --git a/Blink3.Web/Components/LoginDisplay.razor b/Blink3.Web/Components/LoginDisplay.razor
@@ -4,14 +4,14 @@
 <AuthorizeView>
     <Authorized>
         <Dropdown>
-            <DropdownToggleButton Color="ButtonColor.Secondary">@(context.User.GetDisplayName())</DropdownToggleButton>
+            <DropdownToggleButton Color="ButtonColor.Link">@(context.User.GetDisplayName())</DropdownToggleButton>
             <DropdownMenu>
                 <DropdownItem @onclick="Logout">Logout</DropdownItem>
             </DropdownMenu>
         </Dropdown>
     </Authorized>
     <NotAuthorized>
-        <Button Color="ButtonColor.Secondary" @onclick="Login">Login</Button>
+        <Button Color="ButtonColor.Link" @onclick="Login">Login</Button>
     </NotAuthorized>
 </AuthorizeView>
 

diff --git a/Blink3.Web/Layout/MainLayout.razor b/Blink3.Web/Layout/MainLayout.razor
@@ -11,11 +11,11 @@
               DataProvider="SidebarDataProvider"/>
 
     <main>
-        <div class="top-row px-4 border-bottom">
+        <div class="top-row px-3 border-bottom bg-dark">
             <LoginDisplay/>
         </div>
 
-        <article class="content px-4">
+        <article class="p-4">
             @Body
         </article>
     </main>

diff --git a/Blink3.Web/wwwroot/css/app.css b/Blink3.Web/wwwroot/css/app.css
@@ -2,41 +2,8 @@ html, body {
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
-h1:focus {
-    outline: none;
-}
-
-.content {
-    padding-top: 1.1rem;
-}
-
 #blazor-error-ui {
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
     display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-#blazor-error-ui .dismiss {
-    cursor: pointer;
-    position: absolute;
-    right: 0.75rem;
-    top: 0.5rem;
-}
-
-.blazor-error-boundary {
-    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
-    padding: 1rem 1rem 1rem 3.7rem;
-    color: white;
-}
-
-.blazor-error-boundary::after {
-    content: "An error has occurred."
 }
 
 .loading-progress {

diff --git a/Blink3.Web/wwwroot/img/blink.png b/Blink3.Web/wwwroot/img/blink.png
diff --git a/Blink3.Web/wwwroot/index.html b/Blink3.Web/wwwroot/index.html
@@ -35,10 +35,11 @@
     <div class="loading-progress-text"></div>
 </div>
 
-<div id="blazor-error-ui">
-    An unhandled error has occurred.
-    <a class="reload" href="">Reload</a>
-    <a class="dismiss">🗙</a>
+<div id="blazor-error-ui" class="position-fixed bottom-0 start-0 w-100">
+    <div class="alert alert-danger m-0 d-flex justify-content-between" role="alert">
+        <span>An unhandled error has occurred.  Please <a class="reload" href="">reload</a> the page.</span>
+        <a role="button" class="dismiss icon-link text-decoration-none">✖</a>
+    </div>
 </div>
 
 <!--suppress HtmlUnknownTarget -->