From 05176244b3c0786aeac6f4eed96f34f55c9504ea Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 28 Mar 2024 17:48:42 +0100 Subject: [PATCH] Continuo fix bootstrap 5 --- MP.Stats/Components/CmpFooter.razor | 14 +- MP.Stats/Components/HomeButton.razor | 2 +- MP.Stats/Pages/Index.razor | 39 ++- MP.Stats/Shared/MainLayout.razor | 41 +-- MP.Stats/Shared/MainLayout.razor.cs | 65 ++++ MP.Stats/Shared/MainLayout.razor.css | 62 ++-- MP.Stats/Shared/NavMenu.razor | 20 +- MP.Stats/wwwroot/css/fonts.css | 24 +- MP.Stats/wwwroot/css/fonts.less | 30 +- MP.Stats/wwwroot/css/fonts.min.css | 2 +- MP.Stats/wwwroot/css/site.css | 15 +- MP.Stats/wwwroot/css/site.less | 8 +- MP.Stats/wwwroot/css/site.min.css | 2 +- .../roboto-condensed-v19-latin-regular.eot | Bin 0 -> 17834 bytes .../roboto-condensed-v19-latin-regular.svg | 306 ++++++++++++++++++ .../roboto-condensed-v19-latin-regular.ttf | Bin 0 -> 36144 bytes .../roboto-condensed-v19-latin-regular.woff | Bin 0 -> 20156 bytes .../roboto-condensed-v19-latin-regular.woff2 | Bin 0 -> 15720 bytes MP.Stats/wwwroot/images/EgalwareLogo.svg | 1 + MP.Stats/wwwroot/{img => images}/LogoBlu.svg | 0 MP.Stats/wwwroot/images/LogoEgw.png | Bin 0 -> 3051 bytes MP.Stats/wwwroot/images/favicon.ico | Bin 0 -> 31702 bytes MP.Stats/wwwroot/images/favicon.png | Bin 0 -> 87309 bytes 23 files changed, 521 insertions(+), 110 deletions(-) create mode 100644 MP.Stats/Shared/MainLayout.razor.cs create mode 100644 MP.Stats/wwwroot/fonts/roboto-condensed-v19-latin-regular.eot create mode 100644 MP.Stats/wwwroot/fonts/roboto-condensed-v19-latin-regular.svg create mode 100644 MP.Stats/wwwroot/fonts/roboto-condensed-v19-latin-regular.ttf create mode 100644 MP.Stats/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff create mode 100644 MP.Stats/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff2 create mode 100644 MP.Stats/wwwroot/images/EgalwareLogo.svg rename MP.Stats/wwwroot/{img => images}/LogoBlu.svg (100%) create mode 100644 MP.Stats/wwwroot/images/LogoEgw.png create mode 100644 MP.Stats/wwwroot/images/favicon.ico create mode 100644 MP.Stats/wwwroot/images/favicon.png diff --git a/MP.Stats/Components/CmpFooter.razor b/MP.Stats/Components/CmpFooter.razor index 71530453..3009e8b2 100644 --- a/MP.Stats/Components/CmpFooter.razor +++ b/MP.Stats/Components/CmpFooter.razor @@ -1,12 +1,10 @@ -
-
- MP-STATS v.@version +
+
+ MagMan v.@version
-
- @adesso -
-
- powered by Egalware +
+ @adesso + Egalware
diff --git a/MP.Stats/Components/HomeButton.razor b/MP.Stats/Components/HomeButton.razor index a95e548a..036d92f0 100644 --- a/MP.Stats/Components/HomeButton.razor +++ b/MP.Stats/Components/HomeButton.razor @@ -1,4 +1,4 @@ - + @Descript diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index ba17de50..7292bc7c 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -5,30 +5,43 @@ @inject MessageService MessageService -
-
-
+ +
+
+

MP STATS

Modulo Statistiche per MoonPro
-
+
| | |
-
-
-
- - - - - - +
+
+
+
+

+  Egalware +

+
+
+
+
+
+ + + + + + + +
+
diff --git a/MP.Stats/Shared/MainLayout.razor b/MP.Stats/Shared/MainLayout.razor index 96964e0e..79b94cfd 100644 --- a/MP.Stats/Shared/MainLayout.razor +++ b/MP.Stats/Shared/MainLayout.razor @@ -3,21 +3,20 @@ @using MP.Stats.Data @using MP.Stats.Components @inject MessageService MessageService -@implements IDisposable
-
+
-
+
-
+
@Body -
+
@@ -25,35 +24,3 @@
-@code { - bool ShowSearch { get; set; } = false; - - protected override void OnInitialized() - { - MessageService.EA_ShowSearch += OnShowSearch; - MessageService.EA_HideSearch += OnHideSearch; - } - public void OnShowSearch() - { - ShowSearch = true; - InvokeAsync(() => - { - StateHasChanged(); - }); - } - public void OnHideSearch() - { - ShowSearch = false; - InvokeAsync(() => - { - StateHasChanged(); - }); - } - - public void Dispose() - { - MessageService.EA_ShowSearch -= OnShowSearch; - MessageService.EA_ShowSearch -= OnHideSearch; - } - -} \ No newline at end of file diff --git a/MP.Stats/Shared/MainLayout.razor.cs b/MP.Stats/Shared/MainLayout.razor.cs new file mode 100644 index 00000000..4666af12 --- /dev/null +++ b/MP.Stats/Shared/MainLayout.razor.cs @@ -0,0 +1,65 @@ +using MP.Stats.Data; +using System; + +namespace MP.Stats.Shared +{ + public partial class MainLayout : IDisposable + { + #region Public Methods + + public void Dispose() + { + MessageService.EA_ShowSearch -= OnShowSearch; + MessageService.EA_ShowSearch -= OnHideSearch; + } + + public void OnHideSearch() + { + ShowSearch = false; + InvokeAsync(() => + { + StateHasChanged(); + }); + } + + public void OnShowSearch() + { + ShowSearch = true; + InvokeAsync(() => + { + StateHasChanged(); + }); + } + + #endregion Public Methods + + #region Protected Properties + + protected bool navLarge { get; set; } = true; + protected string sideClass { get; set; } = "sidebar"; + + #endregion Protected Properties + + #region Protected Methods + + protected override void OnInitialized() + { + MessageService.EA_ShowSearch += OnShowSearch; + MessageService.EA_HideSearch += OnHideSearch; + } + + protected void UpdateNavDisplay() + { + navLarge = !navLarge; + sideClass = navLarge ? "sidebar" : "sidebarSmall"; + } + + #endregion Protected Methods + + #region Private Properties + + private bool ShowSearch { get; set; } = false; + + #endregion Private Properties + } +} \ No newline at end of file diff --git a/MP.Stats/Shared/MainLayout.razor.css b/MP.Stats/Shared/MainLayout.razor.css index 83f592d8..8dc48221 100644 --- a/MP.Stats/Shared/MainLayout.razor.css +++ b/MP.Stats/Shared/MainLayout.razor.css @@ -4,11 +4,11 @@ flex-direction: column; } -.main { +main { flex: 1; } -.sidebar { +.sidebar, .sidebarSmall { background-image: linear-gradient(180deg, rgb(5, 39, 103) 20%, #3aa6ff 90%); } @@ -16,14 +16,14 @@ background-color: #f7f7f7; border-bottom: 1px solid #d6d5d5; height: 3.5rem; + align-items: center; /*justify-content: space-evenly; display: flex;*/ - align-items: center; } .top-row ::deep a, .top-row .btn-link { white-space: nowrap; - margin-left: 1.5rem; + margin-left: 0.5rem; } .top-row a:first-child { @@ -31,26 +31,6 @@ text-overflow: ellipsis; } -.bottom-row { - color: #dedede; - background-color: #000000; - /*border-bottom: 1px solid #313131;*/ - /*justify-content: flex-end;*/ - height: 2rem; - /*display: flex;*/ - align-items: center; -} - - .bottom-row ::deep a, .top-row .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - } - - .bottom-row a:first-child { - overflow: hidden; - text-overflow: ellipsis; - } - @media (max-width: 640.98px) { .top-row:not(.auth) { display: none; @@ -65,13 +45,34 @@ } } +.bottom-row { + color: #dedede; + background-color: #000000; + height: 1.6rem; + align-items: center; +} + +@media (max-width: 640.99px) { + .main > div { + padding-left: 0.5rem !important; + padding-right: 0.5rem !important; + } +} + @media (min-width: 641px) { .page { flex-direction: row; } .sidebar { - width: 250px; + width: 230px; + height: 100vh; + position: sticky; + top: 0; + } + + .sidebarSmall { + width: 80px; height: 100vh; position: sticky; top: 0; @@ -83,6 +84,11 @@ z-index: 1; } + .top-row, article { + padding-left: 1rem !important; + padding-right: 1.0rem !important; + } + .bottom-row { position: fixed; bottom: 0; @@ -90,7 +96,7 @@ } .main > div { - padding-left: 2rem !important; - padding-right: 1.5rem !important; + /*padding-left: 0.5rem !important; + padding-right: 0.5rem !important;*/ } -} \ No newline at end of file +} diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 24998ad8..6c4c0254 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -1,4 +1,4 @@ -
+
MP-STATS