Skip to content

Commit 0c5d0fe

Browse files
committed
Merge branch 'main' into refactor-compact
2 parents 4ac0877 + b99def5 commit 0c5d0fe

File tree

111 files changed

+1532
-379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1532
-379
lines changed

.github/ISSUE_TEMPLATE/10_bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ body:
7474
- NET8.0
7575
- NET7.0
7676
- NET6.0
77-
default: 1
77+
default: 0
7878
validations:
7979
required: true
8080
- type: textarea

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="9.0.0" />
3232
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
3333
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
34-
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.1" />
3534
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
3635
<PackageReference Include="BootstrapBlazor.DockView" Version="9.0.1" />
3736
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.0" />
@@ -47,7 +46,7 @@
4746
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.0" />
4847
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0" />
4948
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0" />
50-
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.9-beta01" />
49+
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.10" />
5150
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.2" />
5251
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0" />
5352
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />

src/BootstrapBlazor.Server/Components/App.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<meta name="keywords" content="bootstrapblazor,bootstrap,blazor,wasm,webassembly,UI,netcore,web,assembly">
1414
<meta name="description" content="基于 Bootstrap 风格的 Blazor UI 组件库,用于研发企业级中后台产品。">
1515
<meta name="author" content="argo ([email protected])">
16+
<meta name="theme-color" content="#712cf9">
1617
<title>@Localizer["SiteTitle"]</title>
1718
<base href="/" />
1819
<link rel="icon" href="favicon.ico" type="image/x-icon">

src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515

1616
.culture-selector ::deep .select {
17-
width: 210px;
17+
width: var(--bb-header-select-width);
1818
}
1919

2020
::deep .form-control {
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
@inject IStringLocalizer<GlobalSearch> Localizer
22

3-
<MeiliSearchBox SearchBoxPlaceHolder="@Localizer["SearchPlaceHolder"]" SearchStatus="@Localizer["SearchStatus"]" SearchResultPlaceHolder="@Localizer["SearchResultPlaceHolder"]"></MeiliSearchBox>
3+
<MeiliSearchBox SearchBoxPlaceHolder="@Localizer["SearchPlaceHolder"]" SearchStatus="@Localizer["SearchStatus"]" SearchResultPlaceHolder="@Localizer["SearchResultPlaceHolder"]" SearchableColumns="SearchableColumns"></MeiliSearchBox>
4+
5+
@code {
6+
private List<string> SearchableColumns { get; set; } = new List<string> { "menu", "title", "subTitle", "demos.title", "demos.raw" };
7+
}

src/BootstrapBlazor.Server/Components/Components/Header.razor.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@
6363
border-radius: var(--bs-border-radius);
6464
}
6565

66+
::deep .bb-g-search {
67+
width: var(--bb-header-select-width);
68+
margin-bottom: var(--bb-header-search-margin-bottom);
69+
}
70+
6671
@media (min-width: 768px) {
6772
.navbar-header {
6873
position: sticky;

src/BootstrapBlazor.Server/Components/Components/Pre.razor.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
border-radius: var(--bs-border-radius);
55
overflow: hidden;
66
direction: ltr;
7+
width: 100%;
78
}
89

910
.pre-code:not(:last-child) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div class="bb-reboot-clock">
2-
<FlipClock ViewMode="FlipClockViewMode.CountDown" ShowHour="false" StartValue="TimeSpan.FromMinutes(2)"></FlipClock>
2+
<FlipClock ViewMode="FlipClockViewMode.CountDown" ShowHour="false" StartValue="TimeSpan.FromSeconds(140)"></FlipClock>
33
</div>

src/BootstrapBlazor.Server/Components/Pages/Localization.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ public class CultureController : Controller
240240
// @Localizer["N49"]
241241
options.AdditionalJsonFiles = new string[]
242242
{
243-
@@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Shared\Locales\zh-TW.json",
244-
@@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Shared\Locales\zh-CN.json"
243+
@@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Server\Locales\zh-TW.json",
244+
@@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Server\Locales\zh-CN.json"
245245
};
246246
});
247247
}

src/BootstrapBlazor.Server/Components/Samples/Cascaders.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public sealed partial class Cascaders
1313
/// <summary>
1414
/// Foo 类为Demo测试用,如有需要请自行下载源码查阅
1515
/// Foo class is used for Demo test, please download the source code if necessary
16-
/// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Shared/Data/Foo.cs
16+
/// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Server/Data/Foo.cs
1717
/// </summary>
1818
private Foo Model { get; set; } = new Foo();
1919

0 commit comments

Comments
 (0)