From bbc6c0fbd39cabdb7296b77079cb8e83f7ef8ad8 Mon Sep 17 00:00:00 2001 From: ChiaraBm Date: Fri, 2 May 2025 13:06:09 +0200 Subject: [PATCH] Upgraded to latest mooncore packages. Upgraded to tailwind v4 --- .../Http/Controllers/OAuth2/Login.razor | 2 +- .../Http/Controllers/OAuth2/Register.razor | 2 +- .../Services/BundleGenerationService.cs | 10 + Moonlight.Client/Moonlight.Client.csproj | 4 +- Moonlight.Client/Styles/additions/buttons.css | 84 +- Moonlight.Client/Styles/additions/cards.css | 12 +- Moonlight.Client/Styles/additions/fonts.css | 11 +- Moonlight.Client/Styles/additions/forms.css | 6 +- .../Styles/additions/progress.css | 2 +- Moonlight.Client/Styles/additions/tabs.css | 11 + Moonlight.Client/Styles/additions/theme.css | 164 +- .../Styles/additions/theme.white.css | 23 + Moonlight.Client/Styles/mappings/mooncore.map | 807 +++---- Moonlight.Client/Styles/package-lock.json | 1896 +++++++---------- Moonlight.Client/Styles/package.json | 7 +- Moonlight.Client/Styles/style.css | 94 +- Moonlight.Client/Styles/tailwind.config.js | 132 -- Moonlight.Client/UI/Components/StatCard.razor | 2 +- Moonlight.Client/UI/Layouts/MainLayout.razor | 17 +- .../UI/Partials/Design/ThemeSettings.razor | 8 +- .../UI/Views/Admin/Api/Index.razor | 22 +- .../UI/Views/Admin/Sys/Advanced.razor | 4 +- .../UI/Views/Admin/Sys/Files.razor | 2 +- .../UI/Views/Admin/Sys/Hangfire.razor | 2 +- .../UI/Views/Admin/Sys/Index.razor | 2 +- .../UI/Views/Admin/Sys/Theme.razor | 2 +- .../UI/Views/Admin/Users/Index.razor | 4 +- Moonlight.Client/wwwroot/index.html | 17 +- 28 files changed, 1386 insertions(+), 1963 deletions(-) create mode 100644 Moonlight.Client/Styles/additions/tabs.css create mode 100644 Moonlight.Client/Styles/additions/theme.white.css delete mode 100644 Moonlight.Client/Styles/tailwind.config.js diff --git a/Moonlight.ApiServer/Http/Controllers/OAuth2/Login.razor b/Moonlight.ApiServer/Http/Controllers/OAuth2/Login.razor index 7ce293ad..0cc98c8d 100644 --- a/Moonlight.ApiServer/Http/Controllers/OAuth2/Login.razor +++ b/Moonlight.ApiServer/Http/Controllers/OAuth2/Login.razor @@ -9,7 +9,7 @@
- Your Company + Moonlight

Login into your account

diff --git a/Moonlight.ApiServer/Http/Controllers/OAuth2/Register.razor b/Moonlight.ApiServer/Http/Controllers/OAuth2/Register.razor index 4b9de47b..b7bf0953 100644 --- a/Moonlight.ApiServer/Http/Controllers/OAuth2/Register.razor +++ b/Moonlight.ApiServer/Http/Controllers/OAuth2/Register.razor @@ -9,7 +9,7 @@
- Your Company + Moonlight

Create your account

diff --git a/Moonlight.ApiServer/Services/BundleGenerationService.cs b/Moonlight.ApiServer/Services/BundleGenerationService.cs index cbfc27c0..9356a299 100644 --- a/Moonlight.ApiServer/Services/BundleGenerationService.cs +++ b/Moonlight.ApiServer/Services/BundleGenerationService.cs @@ -81,6 +81,16 @@ public class BundleGenerationService : IHostedService if (physicalPaths.Count == 1) // Only one stylesheet => nothing to process return await File.ReadAllTextAsync(physicalPaths[0]); + // Simple bundler just to test + var result = ""; + + foreach (var path in physicalPaths) + { + result += await File.ReadAllTextAsync(path); + } + + return result; + // Create bundle by stripping out double declared classes and combining all css files into one bundle var parser = new StylesheetParser(); string? content = null; diff --git a/Moonlight.Client/Moonlight.Client.csproj b/Moonlight.Client/Moonlight.Client.csproj index 7b687b11..d9ca1883 100644 --- a/Moonlight.Client/Moonlight.Client.csproj +++ b/Moonlight.Client/Moonlight.Client.csproj @@ -1,6 +1,7 @@ + false net8.0 enable enable @@ -27,7 +28,7 @@ - +