Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
588776c
feat(Theme): add Fluent UI theme
h2ls Aug 17, 2026
56f8d33
docs(Theme): add Fluent UI theme to theme page
h2ls Aug 17, 2026
e8e8efc
feat(Theme): adapt flyout surfaces to Fluent UI style
h2ls Aug 17, 2026
7ea0dd6
docs: add Fluent UI parity review report
h2ls Aug 17, 2026
bfbfc53
feat(Theme): complete Fluent UI theme tokens and component coverage
h2ls Aug 17, 2026
45db86f
feat(Theme): make Motronic an optional theme instead of global styles…
h2ls Aug 17, 2026
b48f3be
docs(Theme): add component preview wall and update theme usage docs
h2ls Aug 17, 2026
562e7d9
fix(ThemeChooser): close panel on selection and improve mobile behavior
h2ls Aug 17, 2026
6d07b0c
test(Sass): add Fluent theme CSS variable regression tests
h2ls Aug 17, 2026
1308797
docs: log Fluent UI theme plan execution results
h2ls Aug 17, 2026
220d915
Merge branch 'main' into lee/feat-fluent-ui-theme
ArgoZhang Aug 21, 2026
d8ad4bd
fix(Theme): resolve Fluent theme compatibility conflicts with site st…
h2ls Aug 21, 2026
1ce01c5
feat(Theme): align Fluent theme controls with Fluent 2 sizing and spa…
h2ls Aug 21, 2026
647d1b6
docs: add Fluent theme comprehensive review and compatibility assessment
h2ls Aug 21, 2026
75d4044
fix(Theme): resolve Fluent sizing-layer regressions and dark-mode gaps
h2ls Aug 21, 2026
aae30d0
Merge branch 'main' into lee/feat-fluent-ui-theme
ArgoZhang Aug 21, 2026
e5c8d29
Merge remote-tracking branch 'origin/main' into lee/feat-fluent-ui-theme
ArgoZhang Aug 23, 2026
e0be34f
refactor: 使用扩展包
ArgoZhang Aug 23, 2026
0f9ac5b
revert: 撤销 repro.md 删除操作
ArgoZhang Aug 23, 2026
2090533
revert: 撤销其他文件更改
ArgoZhang Aug 23, 2026
71912e5
revert: 更新样式
ArgoZhang Aug 23, 2026
10e9d58
revert: 撤销更改
ArgoZhang Aug 23, 2026
bfc7532
revert: 撤销更改
ArgoZhang Aug 23, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<PackageReference Include="BootstrapBlazor.TableExport" Version="10.0.2" />
<PackageReference Include="BootstrapBlazor.Tasks.Dashboard" Version="10.0.1" />
<PackageReference Include="BootstrapBlazor.Term" Version="10.0.0" />
<PackageReference Include="BootstrapBlazor.Theme.Fluent" Version="10.0.0-beta01" />
<PackageReference Include="BootstrapBlazor.Topology" Version="10.0.0" />
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="10.0.0" />
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="10.0.15" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@

.card-footer-control {
text-align: center;
color: #d3dce6;
color: var(--bs-secondary-color);
display: block;
}

.card-footer-control:hover {
color: #409eff;
color: var(--bs-primary);
}

.card-footer-control i {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.navbar-header {
.navbar-header {
background-color: transparent;
background-image: linear-gradient(to right, rgba(var(--bb-primary-color-rgb), 1), rgba(var(--bb-primary-color-rgb), 0.9));
box-shadow: 0 0.5rem 1rem rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.1);
Expand Down Expand Up @@ -41,6 +41,8 @@
.nav-link img {
height: 24px;
width: auto;
/* the repo svgs ship without a fill (render black) — invert to white on the colored header */
filter: brightness(0) invert(1);
}

.navbar-version {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the Apache 2.0 License
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
Expand Down Expand Up @@ -45,7 +45,7 @@ private void OnClickTheme(SelectedItem item)
var theme = WebsiteOption.Value.Themes.FirstOrDefault(i => i.Key == item.Value);
if (theme is { Files: not null })
{
_currentTheme.AddRange(theme.Files);
_currentTheme.AddRange(theme.Files.Select(i => Assets[i]));
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.theme-list {
.theme-list {
position: fixed;
z-index: 47;
bottom: 12rem;
Expand All @@ -13,7 +13,7 @@
}

.theme-list.is-open {
height: 306px;
height: 355px;
}

.theme-header {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,47 @@ export function init(id) {
}

const themeList = document.querySelector('.theme-list');
const close = document.querySelector('.theme-list .btn-close');
if (themeList === null) {
return;
}

EventHandler.on(el, 'click', () => {
themeList.classList.toggle('is-open');
});
EventHandler.on(close, 'click', () => {

const close = themeList.querySelector('.btn-close');
if (close) {
EventHandler.on(close, 'click', () => {
themeList.classList.remove('is-open');
});
}

EventHandler.on(themeList, 'click', '.theme-item', () => {
themeList.classList.remove('is-open');
});

const outsideClick = e => {
if (!el.contains(e.target) && !themeList.contains(e.target)) {
themeList.classList.remove('is-open');
}
};
EventHandler.on(document, 'click', outsideClick);
el.themeOutsideClick = outsideClick;
}

export function dispose(id) {
const el = document.getElementById(id);
if (el) {
EventHandler.off(el, 'click');
if (el.themeOutsideClick) {
EventHandler.off(document, 'click', el.themeOutsideClick);
delete el.themeOutsideClick;
}
}

const themeList = document.querySelector('.theme-list');
if (themeList) {
EventHandler.off(themeList, 'click');
}

const close = document.querySelector('.theme-list .btn-close');
Expand Down
8 changes: 7 additions & 1 deletion src/BootstrapBlazor.Server/Components/Pages/Install.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@page "/install"
@page "/install"
@inject IStringLocalizer<Install> Localizer
@inject IOptions<WebsiteOptions> WebsiteOption

Expand Down Expand Up @@ -30,6 +30,9 @@
&lt;link rel="stylesheet" href="@@Assets["_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css"]" /&gt;
@Localizer["BootstrapStyle"]
&lt;link rel="stylesheet" href="@@Assets["_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css"]" /&gt;
@Localizer["FluentDesc"]
dotnet add package BootstrapBlazor.Theme.Fluent
&lt;link rel="stylesheet" href="@@Assets["_content/BootstrapBlazor.Theme.Fluent/fluent.min.css"]" /&gt;
@Localizer["MotronicDesc"]
&lt;link rel="stylesheet" href="@@Assets["_content/BootstrapBlazor/css/motronic.min.css"]" /&gt;</Pre>
</TabItem>
Expand All @@ -38,6 +41,9 @@
&lt;link rel="stylesheet" href="_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css" /&gt;
@Localizer["BootstrapStyle"]
&lt;link rel="stylesheet" href="_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css" /&gt;
@Localizer["FluentDesc"]
dotnet add package BootstrapBlazor.Theme.Fluent
&lt;link rel="stylesheet" href="_content/BootstrapBlazor.Theme.Fluent/fluent.min.css" /&gt;
@Localizer["MotronicDesc"]
&lt;link rel="stylesheet" href="_content/BootstrapBlazor/css/motronic.min.css" /&gt;</Pre>
</TabItem>
Expand Down
Loading
Loading