diff --git a/DynamoLeagueBlazor/Client/Features/Dashboard/TopOffenders/TopOffenders.razor b/DynamoLeagueBlazor/Client/Features/Dashboard/TopOffenders/TopOffenders.razor index ee9c0cd..25719c6 100644 --- a/DynamoLeagueBlazor/Client/Features/Dashboard/TopOffenders/TopOffenders.razor +++ b/DynamoLeagueBlazor/Client/Features/Dashboard/TopOffenders/TopOffenders.razor @@ -37,9 +37,9 @@ else var secondPlayer = _result.Players.Skip(1).First(); var thirdPlayer = _result.Players.Skip(2).First(); } - - - + + + @foreach(var player in _result.Players.Skip(3)) { diff --git a/DynamoLeagueBlazor/Client/Features/Fines/Manage.razor b/DynamoLeagueBlazor/Client/Features/Fines/Manage.razor index 16c0ef9..d11a5fc 100644 --- a/DynamoLeagueBlazor/Client/Features/Fines/Manage.razor +++ b/DynamoLeagueBlazor/Client/Features/Fines/Manage.razor @@ -2,32 +2,40 @@ - Approve or deny & remove this fine? + Do you want to approve this fine? - Cancel - - @if (_processingForm) - { - - Saving... - } - else - { - Deny & Remove - } - - - @if (_processingForm) - { - - Saving... - } - else - { - Approve - } - + + + Cancel + + + + @if (_processingForm) + { + + Saving... + } + else + { + Remove + } + + + + + @if (_processingForm) + { + + Saving... + } + else + { + Approve + } + + + diff --git a/DynamoLeagueBlazor/Client/Features/Players/AddFine.razor b/DynamoLeagueBlazor/Client/Features/Players/AddFine.razor index 3da127f..a2046f4 100644 --- a/DynamoLeagueBlazor/Client/Features/Players/AddFine.razor +++ b/DynamoLeagueBlazor/Client/Features/Players/AddFine.razor @@ -7,7 +7,7 @@ Cancel - + @if (_processingForm) { diff --git a/DynamoLeagueBlazor/Client/Shared/MainLayout.razor b/DynamoLeagueBlazor/Client/Shared/MainLayout.razor index b5dfdc1..dfa04e1 100644 --- a/DynamoLeagueBlazor/Client/Shared/MainLayout.razor +++ b/DynamoLeagueBlazor/Client/Shared/MainLayout.razor @@ -6,12 +6,14 @@ - Fantasy Football + + Fantasy Football + - + OnOpenChanged()) /> - + @@ -72,15 +74,15 @@ }; private ErrorBoundary? _errorBoundary; - private bool _showNavMenu = true; + private bool _showNavMenu; protected override void OnParametersSet() { _errorBoundary?.Recover(); } - private void ToggleNavMenu() + public void OnOpenChanged(bool open = true) { - _showNavMenu = !_showNavMenu; + _showNavMenu = open; } } diff --git a/DynamoLeagueBlazor/Client/Shared/NavMenu/NavMenu.razor b/DynamoLeagueBlazor/Client/Shared/NavMenu/NavMenu.razor index 8cb0a62..f87017c 100644 --- a/DynamoLeagueBlazor/Client/Shared/NavMenu/NavMenu.razor +++ b/DynamoLeagueBlazor/Client/Shared/NavMenu/NavMenu.razor @@ -1,4 +1,4 @@ - + Dashboard Teams @@ -17,11 +17,7 @@ @code { - [Parameter, EditorRequired] public bool Show { get; set; } - - void DrawerToggle() - { - Show = !Show; - } + [Parameter, EditorRequired] public bool Open { get; set; } + [Parameter, EditorRequired] public EventCallback OnOpenChanged { get; set; } } diff --git a/DynamoLeagueBlazor/Client/wwwroot/css/app.css b/DynamoLeagueBlazor/Client/wwwroot/css/app.css index b636927..1430837 100644 --- a/DynamoLeagueBlazor/Client/wwwroot/css/app.css +++ b/DynamoLeagueBlazor/Client/wwwroot/css/app.css @@ -1,16 +1,6 @@ /* TODO: Add local version for offline */ @import url('https://fonts.googleapis.com/css?family=Graduate|Open+Sans:300&display=swap'); -@keyframes spin-animation { - 0% { - transform: rotate(360deg); - } - - 100% { - transform: rotate(0deg); - } -} - .grow { transition: all .2s ease-in-out; } @@ -23,17 +13,6 @@ box-shadow: 0px 0px 10px 0px rgba(89,74,226,0.55); } -/* MudBlazor overrides */ - -.mud-card-header .mud-card-header-actions { - align-self: initial !important; -} - -.mud-nav-link-text { - font-family: "Graduate", sans-serif; - text-transform: uppercase; -} - html, body { height: 100vh; } @@ -55,7 +34,7 @@ html, body { #loading > img { width: 80%; height: auto; - max-width: 900px; + max-width: 400px; } .loader { @@ -75,4 +54,15 @@ html, body { 100% { transform: rotate(360deg); } +} + +/* MudBlazor overrides */ + +.mud-card-header .mud-card-header-actions { + align-self: initial !important; +} + +.mud-nav-link-text { + font-family: "Graduate", sans-serif; + text-transform: uppercase; } \ No newline at end of file diff --git a/DynamoLeagueBlazor/Client/wwwroot/logo.PNG b/DynamoLeagueBlazor/Client/wwwroot/logo.PNG index 7d3edcb..8bd7260 100644 Binary files a/DynamoLeagueBlazor/Client/wwwroot/logo.PNG and b/DynamoLeagueBlazor/Client/wwwroot/logo.PNG differ