Skip to content

Commit 26fedaf

Browse files
authored
update to Fluent 25-1 (#2)
1 parent 25075d4 commit 26fedaf

14 files changed

+74
-9
lines changed

CS/DynamicPopup/App.razor

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
@DxResourceManager.RegisterScripts()
2+
@DxResourceManager.RegisterTheme(Themes.Fluent.Clone(properties => {
3+
properties.AddFilePaths("css/theme-fluent.css");
4+
}))
5+
26
<Router AppAssembly="@typeof(App).Assembly">
37
<Found Context="routeData">
48
<DxModalPopup />

CS/DynamicPopup/DynamicPopup.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<Folder Include="wwwroot\images\" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="DevExpress.Blazor" Version="24.2.1-alpha-24207" />
12+
<PackageReference Include="DevExpress.Blazor" Version="25.1.*-*" />
1313
</ItemGroup>
14-
</Project>
14+
</Project>

CS/DynamicPopup/Pages/_Host.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta charset="utf-8" />
1111
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0" />
1212
<base href="~/" />
13-
<link href="css/blazor-themes/blazing-berry.bs5.css" rel="stylesheet" />
13+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-LN+7fdVzj6u52u30Kp6M/trliBMCMKTyK833zpbD+pXdCLuTusPj697FH4R/5mcr" crossorigin="anonymous">
1414
<link href="~/css/site.css" rel="stylesheet" />
1515
<link href="DynamicPopup.styles.css" rel="stylesheet" />
1616
<component type="typeof(HeadOutlet)" render-mode="ServerPrerendered" />
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
body {
2+
margin: 0;
3+
}
4+
5+
6+
.w-100 {
7+
width: 100%;
8+
}
9+
10+
.text-danger {
11+
color: var(--DS-color-surface-danger-default-rest);
12+
}
13+
14+
.p-4 {
15+
padding: 1.5rem;
16+
}
17+
18+
.navigation-drawer {
19+
--dxbl-drawer-separator-border-width: 0;
20+
}
21+
22+
.menu-item {
23+
--dxbl-menu-item-color: #fff;
24+
--dxbl-menu-item-image-color: #fff;
25+
}
26+
27+
[data-fluent-darkmode] .dxbl-theme-fluent .welcome-card {
28+
color: var(--DS-primary-70);
29+
}
30+
31+
.icon {
32+
--icon-width: 1.25rem;
33+
--icon-height: 1.25rem;
34+
--icon-back-mask-image: url("/images/back-fluent.svg");
35+
--icon-close-mask-image: url("/images/close-fluent.svg");
36+
--icon-menu-mask-image: url("/images/menu-fluent.svg");
37+
--icon-docs-mask-image: url("/images/doc-fluent.svg");
38+
--icon-demos-mask-image: url("/images/demos-fluent.svg");
39+
--icon-home-mask-image: url("/images/home-fluent.svg");
40+
--icon-weather-mask-image: url("/images/weather-fluent.svg");
41+
--icon-counter-mask-image: url("/images/counter-fluent.svg");
42+
}
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)