Skip to content

Commit c0f6c5a

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'master' into refactor-editor
2 parents 07b168f + fdc5558 commit c0f6c5a

12 files changed

Lines changed: 300 additions & 140 deletions

File tree

‎BootstrapBlazor.Extensions.sln‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.Holiday", "
8383
EndProject
8484
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.Html2Pdf", "src\components\BootstrapBlazor.Html2Pdf\BootstrapBlazor.Html2Pdf.csproj", "{E386EBD8-0028-42B7-8473-F26014C0E326}"
8585
EndProject
86-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.Html2Pdf.iText", "src\components\BootstrapBlazor.Html2Pdf.iText\BootstrapBlazor.Html2Pdf.iText.csproj", "{26452C1D-8FBB-419A-9667-01C34B7C6AC4}"
87-
EndProject
8886
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.IconPark", "src\components\BootstrapBlazor.IconPark\BootstrapBlazor.IconPark.csproj", "{8B374E31-BBC3-4765-82C7-E124C4E1E731}"
8987
EndProject
9088
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.Live2DDisplay", "src\components\BootstrapBlazor.Live2DDisplay\BootstrapBlazor.Live2DDisplay.csproj", "{496554A7-52B0-4E01-9CF3-08F0A2B2FCD8}"
@@ -184,6 +182,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.ChatBot", "
184182
EndProject
185183
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Authenticator", "src\components\BootstrapBlazor.Authenticator\BootstrapBlazor.Authenticator.csproj", "{1FDDF0AD-7AB6-4706-A183-26C680817BB4}"
186184
EndProject
185+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Graph", "src\components\BootstrapBlazor.Graph\BootstrapBlazor.Graph.csproj", "{CED55D86-57CF-CB0D-E880-370C44C0DB1F}"
186+
EndProject
187+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Html2Pdf.Playwright", "src\components\BootstrapBlazor.Html2Pdf.Playwright\BootstrapBlazor.Html2Pdf.Playwright.csproj", "{F3043A78-1942-4524-BDC4-7E88F56DF3D5}"
188+
EndProject
187189
Global
188190
GlobalSection(SolutionConfigurationPlatforms) = preSolution
189191
Debug|Any CPU = Debug|Any CPU
@@ -346,10 +348,6 @@ Global
346348
{E386EBD8-0028-42B7-8473-F26014C0E326}.Debug|Any CPU.Build.0 = Debug|Any CPU
347349
{E386EBD8-0028-42B7-8473-F26014C0E326}.Release|Any CPU.ActiveCfg = Release|Any CPU
348350
{E386EBD8-0028-42B7-8473-F26014C0E326}.Release|Any CPU.Build.0 = Release|Any CPU
349-
{26452C1D-8FBB-419A-9667-01C34B7C6AC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
350-
{26452C1D-8FBB-419A-9667-01C34B7C6AC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
351-
{26452C1D-8FBB-419A-9667-01C34B7C6AC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
352-
{26452C1D-8FBB-419A-9667-01C34B7C6AC4}.Release|Any CPU.Build.0 = Release|Any CPU
353351
{8B374E31-BBC3-4765-82C7-E124C4E1E731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
354352
{8B374E31-BBC3-4765-82C7-E124C4E1E731}.Debug|Any CPU.Build.0 = Debug|Any CPU
355353
{8B374E31-BBC3-4765-82C7-E124C4E1E731}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -498,6 +496,14 @@ Global
498496
{1FDDF0AD-7AB6-4706-A183-26C680817BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
499497
{1FDDF0AD-7AB6-4706-A183-26C680817BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
500498
{1FDDF0AD-7AB6-4706-A183-26C680817BB4}.Release|Any CPU.Build.0 = Release|Any CPU
499+
{CED55D86-57CF-CB0D-E880-370C44C0DB1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
500+
{CED55D86-57CF-CB0D-E880-370C44C0DB1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
501+
{CED55D86-57CF-CB0D-E880-370C44C0DB1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
502+
{CED55D86-57CF-CB0D-E880-370C44C0DB1F}.Release|Any CPU.Build.0 = Release|Any CPU
503+
{F3043A78-1942-4524-BDC4-7E88F56DF3D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
504+
{F3043A78-1942-4524-BDC4-7E88F56DF3D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
505+
{F3043A78-1942-4524-BDC4-7E88F56DF3D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
506+
{F3043A78-1942-4524-BDC4-7E88F56DF3D5}.Release|Any CPU.Build.0 = Release|Any CPU
501507
EndGlobalSection
502508
GlobalSection(SolutionProperties) = preSolution
503509
HideSolutionNode = FALSE
@@ -543,7 +549,6 @@ Global
543549
{BB7FBAC6-0F98-4443-B3A0-B7D0F4164D20} = {FF1089BE-C704-4374-B629-C57C08E1798F}
544550
{162A2C8E-767C-41A7-9020-729E79C4F1F9} = {FF1089BE-C704-4374-B629-C57C08E1798F}
545551
{E386EBD8-0028-42B7-8473-F26014C0E326} = {FF1089BE-C704-4374-B629-C57C08E1798F}
546-
{26452C1D-8FBB-419A-9667-01C34B7C6AC4} = {FF1089BE-C704-4374-B629-C57C08E1798F}
547552
{8B374E31-BBC3-4765-82C7-E124C4E1E731} = {FF1089BE-C704-4374-B629-C57C08E1798F}
548553
{496554A7-52B0-4E01-9CF3-08F0A2B2FCD8} = {FF1089BE-C704-4374-B629-C57C08E1798F}
549554
{7C875492-41A2-401D-90B1-161BCD5103DC} = {FF1089BE-C704-4374-B629-C57C08E1798F}
@@ -584,6 +589,8 @@ Global
584589
{A657E04C-1495-439E-BC2E-1EEAB2D1B4DA} = {FF1089BE-C704-4374-B629-C57C08E1798F}
585590
{2F37FBF4-5C1C-4493-B614-0E8361432621} = {FF1089BE-C704-4374-B629-C57C08E1798F}
586591
{1FDDF0AD-7AB6-4706-A183-26C680817BB4} = {FF1089BE-C704-4374-B629-C57C08E1798F}
592+
{CED55D86-57CF-CB0D-E880-370C44C0DB1F} = {FF1089BE-C704-4374-B629-C57C08E1798F}
593+
{F3043A78-1942-4524-BDC4-7E88F56DF3D5} = {FF1089BE-C704-4374-B629-C57C08E1798F}
587594
EndGlobalSection
588595
GlobalSection(ExtensibilityGlobals) = postSolution
589596
SolutionGuid = {D5EB1960-6F30-4CE1-B375-EAE1F787D6FF}

‎src/components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.1.11</Version>
4+
<Version>9.1.13</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

‎src/components/BootstrapBlazor.DockView/wwwroot/css/dockview-bb.css‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,18 @@
214214
}
215215

216216
.bb-dockview .bb-dockview-aside-left {
217-
left: 2px;
217+
left: 0;
218+
border-right: 1px solid var(--bs-border-color);
218219
}
219220

220221
.bb-dockview .bb-dockview-aside-right {
221-
right: 0
222+
right: 0;
223+
border-left: 1px solid var(--bs-border-color);
222224
}
223225

224226
.bb-dockview .bb-dockview-aside > .bb-dockview-aside-button {
225227
position: relative;
226-
margin-inline: .25rem;
228+
margin: .25rem 2px;
227229
padding-inline: .5rem;
228230
cursor: pointer;
229231
user-select: none;

‎src/components/BootstrapBlazor.DockView/wwwroot/css/dockview.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,10 @@
10801080
border-radius: 2px;
10811081
background-color: var(--dv-icon-hover-background-color);
10821082
}
1083+
.dv-watermark {
1084+
display: flex;
1085+
height: 100%;
1086+
}
10831087
.dv-tabs-overflow-dropdown-default {
10841088
height: 100%;
10851089
color: var(--dv-activegroup-hiddenpanel-tab-color);
@@ -1185,8 +1189,4 @@
11851189
}
11861190
.dv-tabs-and-actions-container .dv-right-actions-container {
11871191
display: flex;
1188-
}
1189-
.dv-watermark {
1190-
display: flex;
1191-
height: 100%;
11921192
}

0 commit comments

Comments
 (0)