Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(Isolation): update dependce pacakge remove css isolation #4858

Merged
merged 14 commits into from
Dec 16, 2024
Merged
14 changes: 7 additions & 7 deletions src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.DockView" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.4" />
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.7" />
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.5" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor.Server/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="keywords" content="bootstrap,blazor,wasm,webassembly,UI,netcore,web,assembly">
<meta name="keywords" content="bootstrapblazor,bootstrap,blazor,wasm,webassembly,UI,netcore,web,assembly">
<meta name="description" content="基于 Bootstrap 风格的 Blazor UI 组件库,用于研发企业级中后台产品。">
<meta name="author" content="argo (argo@live.ca)">
<title>@Localizer["SiteTitle"]</title>
Expand Down Expand Up @@ -42,7 +42,7 @@
<BlazorReconnector @rendermode="new InteractiveServerRenderMode(false)" />

<script src="_content/BootstrapBlazor.SummerNote/js/jquery-3.6.0.min.js"></script>
<script Src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"></script>
<script src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"></script>
<script src="_framework/blazor.web.js"></script>
@if (Env.IsProduction())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
.tabs-coms ::deep > .tabs > .tabs-header {
position: sticky;
top: 0;
z-index: 20;
z-index: 11;
}

::deep :is(.code-razor, .code-cs) pre {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Microsoft.Extensions.DependencyInjection;
/// <summary>
/// 注册服务扩展方法
/// </summary>
public static class ServicesCollectionExtensions
public static class ServiceCollectionSharedExtensions
{
/// <summary>
/// 添加示例后台任务
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor.Server/Locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -4730,7 +4730,7 @@
"CountButton": "CountButton",
"Splitting": "Splitting",
"QueryBuilder": "QueryBuilder",
"SerialService": "ISerialService",
"WebSerial": "ISerialService",
"MindMap": "Mind Map",
"Mermaid": "Mermaid",
"Marquee": "Marquee",
Expand Down Expand Up @@ -6328,7 +6328,7 @@
"MermaidTitle": "Mermaid",
"MermaidDescription": "This component renders Markdown-inspired text definitions to dynamically create and modify diagrams.",
"MermaidNormalTitle": "Basic usage",
"NormalIntro": "Mermaid basic style",
"MermaidNormalIntro": "Mermaid basic style",
"MermaidStyleTitle": "Custom styles",
"MermaidStyleIntro": "",
"MermaidType": "Type"
Expand Down
2 changes: 2 additions & 0 deletions src/BootstrapBlazor.Server/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
"locator": "Locators",
"logout": "Logouts",
"icon": "BootstrapBlazorIcons",
"iframe": "IFrames",
"image-viewer": "ImageViewers",
"input-number": "InputNumbers",
"input": "Inputs",
Expand Down Expand Up @@ -140,6 +141,7 @@
"search-dialog": "SearchDialogs",
"search": "Searches",
"select": "Selects",
"select-generic": "SelectGenerics",
"select-object": "SelectObjects",
"select-tree": "SelectTrees",
"select-table": "SelectTables",
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTestDocs/MenuTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void Localizer_Compare(string sourceLanguage, string targetLanguage)
var target = configEn.GetChildren().SelectMany(section => section.GetChildren().Select(i => $"{section.Key} - {i.Key}")).ToList();

var result = new List<string>();
source.Where(i => !target.Contains(i)).ToList().ForEach(i =>
source.Except(target).ToList().ForEach(i =>
{
result.Add(i);
_logger.WriteLine(i);
Expand Down
Loading