Skip to content

Commit 44b98e9

Browse files
committed
Merge branch 'dev-ac'
# Conflicts: # src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs
2 parents 013419e + 5beb0a5 commit 44b98e9

38 files changed

+4850
-179
lines changed

.github/pull_request_template.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
## Link issues
2-
32
fixes #{issue number}
3+
<!--
44
[Please fill in the relevant Issue number after the # above, such as #42]
55
[请在上方 # 后面填写相关 Issue 编号,如 #42]
6-
6+
-->
77
## Summary By Copilot
88

99

1010
## Regression?
11-
1211
- [ ] Yes
1312
- [ ] No
1413

14+
<!--
1515
[If yes, specify the version the behavior has regressed from]
1616
[是否影响老版本]
17-
17+
-->
1818
## Risk
19-
2019
- [ ] High
2120
- [ ] Medium
2221
- [ ] Low
2322

23+
<!--
2424
[Justify the selection above]
25-
25+
-->
2626
## Verification
27-
2827
- [ ] Manual (required)
2928
- [ ] Automated
3029

3130
## Packaging changes reviewed?
32-
3331
- [ ] Yes
3432
- [ ] No
3533
- [ ] N/A
3634

3735
## ☑️ Self Check before Merge
38-
3936
⚠️ Please check all items below before review. ⚠️
40-
4137
- [ ] Doc is updated/provided or not needed
4238
- [ ] Demo is updated/provided or not needed
4339
- [ ] Merge the latest code from the main branch

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.2" />
23+
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.3" />
2424
<PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="9.0.0" />
2525
<PackageReference Include="BootstrapBlazor.AzureTranslator" Version="9.0.0" />
2626
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="9.0.0" />
2727
<PackageReference Include="BootstrapBlazor.BaiduOcr" Version="9.0.0" />
2828
<PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.0" />
2929
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0" />
30-
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.0" />
30+
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.1" />
3131
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
3232
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
3333
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
3434
<PackageReference Include="BootstrapBlazor.DockView" Version="9.1.1" />
3535
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.3" />
36-
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.2" />
36+
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.3" />
3737
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
3838
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
3939
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.2" />
4040
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.1" />
4141
<PackageReference Include="BootstrapBlazor.Html2Image" Version="9.0.0" />
4242
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.2" />
43-
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.2" />
43+
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.3" />
4444
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
4545
<PackageReference Include="BootstrapBlazor.IP2Region" Version="9.0.1" />
4646
<PackageReference Include="BootstrapBlazor.JuHeIpLocatorProvider" Version="9.0.0" />
@@ -51,7 +51,7 @@
5151
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.3" />
5252
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.1.3" />
5353
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
54-
<PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.3" />
54+
<PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.4" />
5555
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
5656
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
5757
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.0" />
@@ -64,6 +64,7 @@
6464
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.3" />
6565
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.1" />
6666
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
67+
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
6768
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.0-beta05" />
6869
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.3" />
6970
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@inherits LayoutComponentBase
2+
@layout MainLayout
3+
4+
@Body

src/BootstrapBlazor.Server/Components/Samples/Icons/OctIcons.razor.cs renamed to src/BootstrapBlazor.Server/Components/Layout/IconLayout.razor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
55

6-
namespace BootstrapBlazor.Server.Components.Samples.Icons;
6+
namespace BootstrapBlazor.Server.Components.Layout;
77

88
/// <summary>
9-
/// OctIcons 图标示例
9+
/// Icon Layout Component
1010
/// </summary>
11-
public partial class OctIcons
11+
public partial class IconLayout
1212
{
1313

1414
}

src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@Body
1919
</section>
2020

21-
<DialButton DialMode="DialMode.Radial" Icon="fa-solid fa-gear" Radius="100" Placement="Placement.BottomEnd">
21+
<DialButton DialMode="DialMode.Radial" Icon="fa-solid fa-gear" Radius="100" Placement="Placement.BottomEnd" class="bb-dial-gear">
2222
<ButtonTemplate>
2323
<div class="btn-circle btn-fade dial-button-gear">
2424
<img src="./images/logo.png" />

src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
background-color: var(--bb-sidebar-body-drag-hover-bg);
7777
}
7878

79-
::deep .dial-button {
79+
::deep .bb-dial-gear {
8080
display: none;
8181
position: fixed;
8282
z-index: 10;
@@ -172,7 +172,7 @@
172172
display: block;
173173
}
174174

175-
::deep .dial-button {
175+
::deep .bb-dial-gear {
176176
display: block;
177177
}
178178
}

0 commit comments

Comments
 (0)