Skip to content

Commit 0cc3530

Browse files
ChiaraBmChiaraBm
committed
Updated mooncore styles. Adjusted theme editor and theme loading. Changed versions Upgraded mooncore.blazor.flyonui. Made moonlight flyonui/daisyui compatible
1 parent 2f21806 commit 0cc3530

File tree

19 files changed

+341
-163
lines changed

19 files changed

+341
-163
lines changed

‎Moonlight.ApiServer/Http/Controllers/Frontend/FrontendPage.razor‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@using Moonlight.ApiServer.Database.Entities
22

33
<!DOCTYPE html>
4-
<html lang="en" class="bg-background text-base-content font-inter">
4+
<html lang="en" class="bg-base-200 text-base-content font-inter">
55

66
<head>
77
<meta charset="utf-8"/>
@@ -22,48 +22,45 @@
2222
{
2323
<style>
2424
:root {
25-
--mooncore-color-background: @(Theme.Content.ColorBackground);
26-
--mooncore-color-base-100: @(Theme.Content.ColorBase100);
27-
--mooncore-color-base-150: @(Theme.Content.ColorBase150);
28-
--mooncore-color-base-200: @(Theme.Content.ColorBase200);
29-
--mooncore-color-base-250: @(Theme.Content.ColorBase250);
30-
--mooncore-color-base-300: @(Theme.Content.ColorBase300);
31-
--mooncore-color-base-content: @(Theme.Content.ColorBaseContent);
25+
--color-base-100: @(Theme.Content.ColorBase100);
26+
--color-base-200: @(Theme.Content.ColorBase200);
27+
--color-base-300: @(Theme.Content.ColorBase300);
28+
--color-base-content: @(Theme.Content.ColorBaseContent);
3229
33-
--mooncore-color-primary: @(Theme.Content.ColorPrimary);
34-
--mooncore-color-primary-content: @(Theme.Content.ColorPrimaryContent);
30+
--color-primary: @(Theme.Content.ColorPrimary);
31+
--color-primary-content: @(Theme.Content.ColorPrimaryContent);
3532
36-
--mooncore-color-secondary: @(Theme.Content.ColorSecondary);
37-
--mooncore-color-secondary-content: @(Theme.Content.ColorSecondaryContent);
33+
--color-secondary: @(Theme.Content.ColorSecondary);
34+
--color-secondary-content: @(Theme.Content.ColorSecondaryContent);
3835
39-
--mooncore-color-accent: @(Theme.Content.ColorAccent);
40-
--mooncore-color-accent-content: @(Theme.Content.ColorAccentContent);
36+
--color-accent: @(Theme.Content.ColorAccent);
37+
--color-accent-content: @(Theme.Content.ColorAccentContent);
4138
42-
--mooncore-color-neutral: @(Theme.Content.ColorNeutral);
43-
--mooncore-color-neutral-content: @(Theme.Content.ColorNeutralContent);
39+
--color-neutral: @(Theme.Content.ColorNeutral);
40+
--color-neutral-content: @(Theme.Content.ColorNeutralContent);
4441
45-
--mooncore-color-info: @(Theme.Content.ColorInfo);
46-
--mooncore-color-info-content: @(Theme.Content.ColorInfoContent);
42+
--color-info: @(Theme.Content.ColorInfo);
43+
--color-info-content: @(Theme.Content.ColorInfoContent);
4744
48-
--mooncore-color-success: @(Theme.Content.ColorSuccess);
49-
--mooncore-color-success-content: @(Theme.Content.ColorSuccessContent);
45+
--color-success: @(Theme.Content.ColorSuccess);
46+
--color-success-content: @(Theme.Content.ColorSuccessContent);
5047
51-
--mooncore-color-warning: @(Theme.Content.ColorWarning);
52-
--mooncore-color-warning-content: @(Theme.Content.ColorWarningContent);
48+
--color-warning: @(Theme.Content.ColorWarning);
49+
--color-warning-content: @(Theme.Content.ColorWarningContent);
5350
54-
--mooncore-color-error: @(Theme.Content.ColorError);
55-
--mooncore-color-error-content: @(Theme.Content.ColorErrorContent);
51+
--color-error: @(Theme.Content.ColorError);
52+
--color-error-content: @(Theme.Content.ColorErrorContent);
5653
57-
--mooncore-radius-selector: @(Theme.Content.RadiusSelector)rem;
58-
--mooncore-radius-field: @(Theme.Content.RadiusField)rem;
59-
--mooncore-radius-box: @(Theme.Content.RadiusBox)rem;
54+
--radius-selector: @(Theme.Content.RadiusSelector)rem;
55+
--radius-field: @(Theme.Content.RadiusField)rem;
56+
--radius-box: @(Theme.Content.RadiusBox)rem;
6057
61-
--mooncore-size-selector: @(Theme.Content.SizeSelector)rem;
62-
--mooncore-size-field: @(Theme.Content.SizeField)rem;
58+
--size-selector: @(Theme.Content.SizeSelector)rem;
59+
--size-field: @(Theme.Content.SizeField)rem;
6360
64-
--mooncore-border: @(Theme.Content.Border)px;
65-
--mooncore-depth: @(Theme.Content.Depth);
66-
--mooncore-noise: @(Theme.Content.Noise);
61+
--border: @(Theme.Content.Border)px;
62+
--depth: @(Theme.Content.Depth);
63+
--noise: @(Theme.Content.Noise);
6764
}
6865
</style>
6966
}

‎Moonlight.ApiServer/Http/Controllers/LocalAuth/Login.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html lang="en" class="h-full bg-background">
1+
<html lang="en" class="h-full bg-base-200">
22
<head>
33
<title>Login into your account</title>
44
<meta charset="UTF-8"/>

‎Moonlight.ApiServer/Http/Controllers/LocalAuth/Register.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html lang="en" class="h-full bg-background">
1+
<html lang="en" class="h-full bg-base-200">
22
<head>
33
<title>Register a new account</title>
44
<meta charset="UTF-8"/>

‎Moonlight.ApiServer/Moonlight.ApiServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414
<PropertyGroup>
1515
<PackageId>Moonlight.ApiServer</PackageId>
16-
<Version>2.1.14</Version>
16+
<Version>2.1.15</Version>
1717
<Authors>Moonlight Panel</Authors>
1818
<Description>A build of the api server for moonlight development</Description>
1919
<PackageProjectUrl>https://github.com/Moonlight-Panel/Moonlight</PackageProjectUrl>

‎Moonlight.Client.Runtime/Moonlight.Client.Runtime.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.9" PrivateAssets="all" />
2020
</ItemGroup>
2121

22+
<ItemGroup>
23+
<Folder Include="wwwroot\css\" />
24+
</ItemGroup>
25+
2226
<Import Project="Plugins.props" />
2327

2428
</Project>

‎Moonlight.Client.Runtime/Styles/styles.css‎

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@
99
@theme {
1010
--font-inter: "Inter", var(--font-sans);
1111
--font-scp: "Source Code Pro", var(--font-mono);
12-
13-
--color-background: var(--mooncore-color-background);
14-
--color-base-150: var(--mooncore-color-base-150);
15-
--color-base-250: var(--mooncore-color-base-250);
1612
}
1713

1814
@plugin "flyonui" {
19-
themes: mooncore --default;
15+
themes: moonlight --default;
2016
}
2117

2218
@source "./node_modules/flyonui/dist/index.js";
@@ -45,60 +41,21 @@
4541
width: var(--blazor-load-percentage, 0%);
4642
}
4743

48-
@plugin "flyonui/theme" {
49-
name: "mooncore";
50-
default: true;
51-
prefersdark: true;
52-
color-scheme: "dark";
53-
--color-base-100: var(--mooncore-color-base-100);
54-
--color-base-200: var(--mooncore-color-base-200);
55-
--color-base-300: var(--mooncore-color-base-300);
56-
--color-base-content: var(--mooncore-color-base-content);
57-
--color-primary: var(--mooncore-color-primary);
58-
--color-primary-content: var(--mooncore-color-primary-content);
59-
--color-secondary: var(--mooncore-color-secondary);
60-
--color-secondary-content: var(--mooncore-color-secondary-content);
61-
--color-accent: var(--mooncore-color-accent);
62-
--color-accent-content: var(--mooncore-color-accent-content);
63-
--color-neutral: var(--mooncore-color-neutral);
64-
--color-neutral-content: var(--mooncore-color-neutral-content);
65-
--color-info: var(--mooncore-color-info);
66-
--color-info-content: var(--mooncore-color-info-content);
67-
--color-success: var(--mooncore-color-success);
68-
--color-success-content: var(--mooncore-color-success-content);
69-
--color-warning: var(--mooncore-color-warning);
70-
--color-warning-content: var(--mooncore-color-warning-content);
71-
--color-error: var(--mooncore-color-error);
72-
--color-error-content: var(--mooncore-color-error-content);
73-
--radius-selector: var(--mooncore-radius-selector);
74-
--radius-field: var(--mooncore-radius-field);
75-
--radius-box: var(--mooncore-radius-box);
76-
--size-selector: var(--mooncore-size-selector);
77-
--size-field: var(--mooncore-size-field);
78-
--border: var(--mooncore-border);
79-
--depth: var(--mooncore-depth);
80-
--noise: var(--mooncore-noise);
81-
}
82-
8344
@layer utilities {
8445
.btn {
8546
@apply text-sm font-medium inline-flex items-center justify-center;
8647
}
87-
48+
8849
.checkbox {
8950
@apply border-base-content/30 bg-base-100;
9051
}
91-
52+
9253
.input {
93-
@apply !border-base-content/20 border-2 ring-0! outline-0! focus:border-primary! focus-within:border-primary! bg-base-200/50;
94-
}
95-
96-
.advance-select-toggle {
97-
@apply !border-base-content/20 border-2 ring-0! outline-0! focus:border-primary! focus-within:border-primary! bg-base-200/50;
54+
@apply !border-base-content/20 border-2 ring-0! outline-0! focus:border-primary! focus-within:border-primary! bg-base-100/50;
9855
}
9956

10057
.select {
101-
@apply !border-base-content/20 border-2 ring-0! outline-0! focus:border-primary! focus-within:border-primary! bg-base-200/50;
58+
@apply !border-base-content/20 border-2 ring-0! outline-0! focus:border-primary! focus-within:border-primary! bg-base-100/50;
10259
}
10360

10461
.table {
@@ -111,10 +68,6 @@
11168
@apply px-2.5 py-1.5 text-sm;
11269
}
11370

114-
.dropdown-menu {
115-
@apply bg-base-150;
116-
}
117-
11871
.advance-select-menu {
11972
@apply !border-base-content/20 border-2 ring-0! outline-0! bg-base-200/50 !pt-0 !px-0 !py-0;
12073
}

‎Moonlight.Client.Runtime/Styles/theme.css‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
@theme {
2-
--mooncore-color-background: #0c0f18;
3-
--mooncore-color-base-100: #1e2b47;
4-
--mooncore-color-base-150: #1a2640;
5-
--mooncore-color-base-200: #101a2e;
6-
--mooncore-color-base-250: #0f1729;
7-
--mooncore-color-base-300: #0c1221;
8-
--mooncore-color-base-content: #dde5f5;
9-
--mooncore-color-primary: oklch(.511 .262 276.966);
10-
--mooncore-color-primary-content: #dde5f5;
11-
--mooncore-color-secondary: oklch(37% 0.034 259.733);
12-
--mooncore-color-secondary-content: #dde5f5;
13-
--mooncore-color-accent: oklch(49.1% 0.27 292.581);
14-
--mooncore-color-accent-content: #dde5f5;
15-
--mooncore-color-neutral: oklch(27% 0.041 260.031);
16-
--mooncore-color-neutral-content: oklch(92% 0.004 286.32);
17-
--mooncore-color-info: oklch(.546 .245 262.881);
18-
--mooncore-color-info-content: #dde5f5;
19-
--mooncore-color-success: oklch(.627 .194 149.214);
20-
--mooncore-color-success-content: #dde5f5;
21-
--mooncore-color-warning: oklch(.828 .189 84.429);
22-
--mooncore-color-warning-content: #dde5f5;
23-
--mooncore-color-error: oklch(.586 .253 17.585);
24-
--mooncore-color-error-content: #dde5f5;
25-
--mooncore-radius-selector: 0.25rem;
26-
--mooncore-radius-field: 0.5rem;
27-
--mooncore-radius-box: 0.5rem;
28-
--mooncore-size-selector: 0.25rem;
29-
--mooncore-size-field: 0.25rem;
30-
--mooncore-border: 1px;
31-
--mooncore-depth: 0;
32-
--mooncore-noise: 0;
1+
@plugin "flyonui/theme" {
2+
name: "moonlight";
3+
prefersdark: true;
4+
color-scheme: "dark";
5+
6+
--color-base-100: #192032;
7+
--color-base-200: #101522;
8+
--color-base-300: #070a14;
9+
10+
--color-base-content: #dde5f5;
11+
--color-primary: oklch(.511 .262 276.966);
12+
--color-primary-content: #dde5f5;
13+
--color-secondary: oklch(37% 0.034 259.733);
14+
--color-secondary-content: #dde5f5;
15+
--color-accent: oklch(49.1% 0.27 292.581);
16+
--color-accent-content: #dde5f5;
17+
--color-neutral: oklch(27% 0.041 260.031);
18+
--color-neutral-content: oklch(92% 0.004 286.32);
19+
--color-info: oklch(.546 .245 262.881);
20+
--color-info-content: #dde5f5;
21+
--color-success: oklch(.627 .194 149.214);
22+
--color-success-content: #dde5f5;
23+
--color-warning: oklch(.828 .189 84.429);
24+
--color-warning-content: #dde5f5;
25+
--color-error: oklch(.586 .253 17.585);
26+
--color-error-content: #dde5f5;
27+
--radius-selector: 0.25rem;
28+
--radius-field: 0.5rem;
29+
--radius-box: 0.5rem;
30+
--size-selector: 0.25rem;
31+
--size-field: 0.25rem;
32+
--border: 1px;
33+
--depth: 0;
34+
--noise: 0;
3335
}

‎Moonlight.Client/Moonlight.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PropertyGroup>
1313
<PackageTags>frontend</PackageTags>
1414
<PackageId>Moonlight.Client</PackageId>
15-
<Version>2.1.14</Version>
15+
<Version>2.1.15</Version>
1616
<Authors>Moonlight Panel</Authors>
1717
<Description>A build of the client for moonlight development</Description>
1818
<PackageProjectUrl>https://github.com/Moonlight-Panel/Moonlight</PackageProjectUrl>
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.9" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
2828
<PackageReference Include="MoonCore" Version="2.0.6" />
29-
<PackageReference Include="MoonCore.Blazor.FlyonUi" Version="1.3.2" />
29+
<PackageReference Include="MoonCore.Blazor.FlyonUi" Version="1.3.4" />
3030
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
3131
</ItemGroup>
3232
<ItemGroup>

0 commit comments

Comments
 (0)