Skip to content

Commit cce1835

Browse files
neozhuneozhu
committed
fixed theme default primary color
1 parent 0d61999 commit cce1835

9 files changed

Lines changed: 17 additions & 29 deletions

File tree

‎src/Application/Application.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<ItemGroup>
1111
<PackageReference Include="AutoMapper" Version="14.0.0" />
1212
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
13-
<PackageReference Include="Ardalis.Specification" Version="9.0.0" />
14-
<PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="9.0.0" />
13+
<PackageReference Include="Ardalis.Specification" Version="9.0.1" />
14+
<PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="9.0.1" />
1515
<PackageReference Include="ClosedXML" Version="0.105.0-rc" />
1616
<PackageReference Include="jcamp.FluentEmail.Core" Version="3.8.0" />
1717
<PackageReference Include="jcamp.FluentEmail.MailKit" Version="3.8.0" />

‎src/Infrastructure/Infrastructure.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Minio" Version="6.0.4" />
1515
<PackageReference Include="QuestPDF" Version="2025.1.6" />
1616
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
17-
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="8.1.1-dev-00120" />
17+
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="8.1.1" />
1818
<PackageReference Include="Serilog.Sinks.Postgresql.Alternative" Version="4.1.3" />
1919
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
2020
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />

‎src/Server.UI/Server.UI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
1919
<PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.3" />
21-
<PackageReference Include="MudBlazor" Version="8.3.0" />
21+
<PackageReference Include="MudBlazor" Version="8.4.0" />
2222
<PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.1" />
2323
<PackageReference Include="Blazor-ApexCharts" Version="5.1.0" />
2424
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.3">

‎src/Server.UI/Services/Layout/LayoutService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ private void UpdateCurrentTheme()
102102
// Body text
103103
CurrentTheme.Typography.Body1.FontSize = FormatFontSize(UserPreferences.Body1FontSize);
104104
CurrentTheme.Typography.Body1.LineHeight = UserPreferences.Body1LineHeight.ToString();
105-
CurrentTheme.Typography.Body1.LetterSpacing = FormatFontSize(UserPreferences.Body1LetterSpacing);
105+
//CurrentTheme.Typography.Body1.LetterSpacing = FormatFontSize(UserPreferences.Body1LetterSpacing);
106106

107107
CurrentTheme.Typography.Body2.FontSize = FormatFontSize(UserPreferences.Body2FontSize);
108108
CurrentTheme.Typography.Body2.LineHeight = UserPreferences.Body1LineHeight.ToString();
109-
CurrentTheme.Typography.Body2.LetterSpacing = FormatFontSize(UserPreferences.Body1LetterSpacing);
109+
//CurrentTheme.Typography.Body2.LetterSpacing = FormatFontSize(UserPreferences.Body1LetterSpacing);
110110

111111
// Caption and overline texts
112112
CurrentTheme.Typography.Caption.FontSize = FormatFontSize(UserPreferences.CaptionFontSize);

‎src/Server.UI/Services/UserPreferences/UserPreference.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public class UserPreference
4949
/// <summary>
5050
/// The primary color for light mode.
5151
/// </summary>
52-
public string PrimaryColor { get; set; } = "#2d4275";
52+
public string PrimaryColor { get; set; } = PrimaryColors[0];
5353

5454
/// <summary>
5555
/// The primary color for dark mode.
5656
/// </summary>
57-
public string DarkPrimaryColor { get; set; } = "#8b9ac6";
57+
public string DarkPrimaryColor { get; set; } = DarkPrimaryColors[0];
5858

5959
/// <summary>
6060
/// Returns a darker version of the primary color.

‎src/Server.UI/Themes/Theme.cs‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static MudTheme ApplicationTheme()
2525
Background = "#f5f5f5",
2626
Surface = "#ffffff",
2727
DrawerBackground = "#ffffff",
28-
TextPrimary = "#2E2E2E",
28+
TextPrimary = "#000000",
2929
TextSecondary = "#111",
3030
SecondaryContrastText = "#F5F5F5",
3131
TextDisabled = "#B0B0B0",
@@ -97,42 +97,36 @@ public static MudTheme ApplicationTheme()
9797
FontSize = "2.25rem",
9898
FontWeight = "700",
9999
LineHeight = "2.5",
100-
LetterSpacing = "-0.02em"
101100
},
102101
H2 = new H2Typography
103102
{
104103
FontSize = "1.875rem",
105104
FontWeight = "700",
106105
LineHeight = "2.25",
107-
LetterSpacing = "0"
108106
},
109107
H3 = new H3Typography
110108
{
111109
FontSize = "1.5rem",
112110
FontWeight = "700",
113111
LineHeight = "2",
114-
LetterSpacing = "0"
115112
},
116113
H4 = new H4Typography
117114
{
118115
FontSize = "1.25rem",
119116
FontWeight = "700",
120117
LineHeight = "1.75",
121-
LetterSpacing = "0"
122118
},
123119
H5 = new H5Typography
124120
{
125121
FontSize = "1.125rem",
126-
FontWeight = "500",
122+
FontWeight = "600",
127123
LineHeight = "1.75",
128-
LetterSpacing = "0"
129124
},
130125
H6 = new H6Typography
131126
{
132127
FontSize = "1rem",
133-
FontWeight = "500",
128+
FontWeight = "600",
134129
LineHeight = "1.5",
135-
LetterSpacing = "0"
136130
},
137131
Button = new ButtonTypography
138132
{
@@ -145,45 +139,39 @@ public static MudTheme ApplicationTheme()
145139
Subtitle1 = new Subtitle1Typography
146140
{
147141
FontSize = ".875rem",
148-
FontWeight = "400",
142+
FontWeight = "500",
149143
LineHeight = "1.5",
150144
LetterSpacing = "normal",
151-
FontFamily = ["Public Sans", "Roboto", "Arial", "sans-serif"]
152145
},
153146
Subtitle2 = new Subtitle2Typography
154147
{
155148
FontSize = ".8125rem",
156149
FontWeight = "500",
157150
LineHeight = "1.57",
158-
LetterSpacing = ".00714em"
159151
},
160152
Body1 = new Body1Typography
161153
{
162154
FontSize = "0.8125rem",
163155
FontWeight = "400",
164156
LineHeight = "1.5",
165-
LetterSpacing = ".00938em"
166157
},
167158
Body2 = new Body2Typography
168159
{
169160
FontSize = ".75rem",
170-
FontWeight = "300",
171-
LineHeight = "1.43",
172-
LetterSpacing = ".01071em"
161+
FontWeight = "400",
162+
LineHeight = "1.4",
173163
},
174164
Caption = new CaptionTypography
175165
{
176166
FontSize = "0.625rem",
177167
FontWeight = "400",
178168
LineHeight = "1.5",
179-
LetterSpacing = ".03333em"
180169
},
181170
Overline = new OverlineTypography
182171
{
183172
FontSize = "0.625rem",
184173
FontWeight = "300",
185174
LineHeight = "2",
186-
LetterSpacing = ".08333em"
187175
}
188176
},
189177
Shadows = new Shadow

‎tests/Application.IntegrationTests/Application.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="FluentAssertions" Version="8.1.1" />
30+
<PackageReference Include="FluentAssertions" Version="8.2.0" />
3131
<PackageReference Include="Moq" Version="4.20.72" />
3232
<PackageReference Include="Respawn" Version="6.2.1" />
3333
</ItemGroup>

‎tests/Application.UnitTests/Application.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Include="FluentAssertions" Version="8.1.1" />
20+
<PackageReference Include="FluentAssertions" Version="8.2.0" />
2121
<PackageReference Include="Moq" Version="4.20.72" />
2222
</ItemGroup>
2323

‎tests/Domain.UnitTests/Domain.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="FluentAssertions" Version="8.1.1" />
21+
<PackageReference Include="FluentAssertions" Version="8.2.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

0 commit comments

Comments
 (0)