From 806c898c70d2a583274d0becf5345a782fa28f20 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Fri, 15 Nov 2024 22:00:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Menu/Menu.razor.scss | 6 +++--- src/BootstrapBlazor/Components/Menu/MenuLink.razor | 2 +- src/BootstrapBlazor/Components/Menu/TopMenu.razor | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BootstrapBlazor/Components/Menu/Menu.razor.scss b/src/BootstrapBlazor/Components/Menu/Menu.razor.scss index 164bea97cb6..e88e9173685 100644 --- a/src/BootstrapBlazor/Components/Menu/Menu.razor.scss +++ b/src/BootstrapBlazor/Components/Menu/Menu.razor.scss @@ -99,14 +99,14 @@ transform: rotate(-90deg); } -.menu .text { +.menu .menu-text { overflow: hidden; vertical-align: top; display: inline-block; transition: width .3s linear; } -.menu .nav .nav-link .text { +.menu .nav .nav-link .menu-text { margin-left: 4px; } @@ -162,7 +162,7 @@ transform: rotate(-90deg); } -.menu .submenu .nav-link .text, +.menu .submenu .nav-link .menu-text, .menu .submenu .nav-link .widget { margin: 0 4px; } diff --git a/src/BootstrapBlazor/Components/Menu/MenuLink.razor b/src/BootstrapBlazor/Components/Menu/MenuLink.razor index 81bf8d28d9d..889e3a893e2 100644 --- a/src/BootstrapBlazor/Components/Menu/MenuLink.razor +++ b/src/BootstrapBlazor/Components/Menu/MenuLink.razor @@ -13,7 +13,7 @@ else
- @Item.Text + @Item.Text
@if (Item.Template != null) { diff --git a/src/BootstrapBlazor/Components/Menu/TopMenu.razor b/src/BootstrapBlazor/Components/Menu/TopMenu.razor index 17edba5b253..6e14bb2a8fc 100644 --- a/src/BootstrapBlazor/Components/Menu/TopMenu.razor +++ b/src/BootstrapBlazor/Components/Menu/TopMenu.razor @@ -11,7 +11,7 @@ { } - @menu.Text + @menu.Text @if (!menu.IsDisabled) { From d72a8cdbeb1e91d72093eb3fb0d322b24cd0d7c5 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Sat, 16 Nov 2024 09:22:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20Menu=20?= =?UTF-8?q?=E9=80=8F=E6=98=8E=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Menu/Menu.razor.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Menu/Menu.razor.scss b/src/BootstrapBlazor/Components/Menu/Menu.razor.scss index e88e9173685..2d329bb7cee 100644 --- a/src/BootstrapBlazor/Components/Menu/Menu.razor.scss +++ b/src/BootstrapBlazor/Components/Menu/Menu.razor.scss @@ -103,7 +103,8 @@ overflow: hidden; vertical-align: top; display: inline-block; - transition: width .3s linear; + opacity: 1; + transition: opacity .3s linear; } .menu .nav .nav-link .menu-text { @@ -207,3 +208,9 @@ .menu.is-bottom .dropdown-menu-arrow:after { content: none; } + +@media (min-width: 768px) { + .is-collapsed .menu .menu-text { + opacity: 0; + } +} From 4bde375d029a3ba8508dc73b42ab29b1dc83718d Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Sat, 16 Nov 2024 10:04:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Menu/Menu.razor.cs | 1 - src/BootstrapBlazor/Components/Menu/Menu.razor.scss | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/src/BootstrapBlazor/Components/Menu/Menu.razor.cs b/src/BootstrapBlazor/Components/Menu/Menu.razor.cs index 7f9b9414ff2..34a0261ae06 100644 --- a/src/BootstrapBlazor/Components/Menu/Menu.razor.cs +++ b/src/BootstrapBlazor/Components/Menu/Menu.razor.cs @@ -16,7 +16,6 @@ public partial class Menu protected string? ClassString => CssBuilder.Default("menu") .AddClass("is-bottom", IsBottom) .AddClass("is-vertical", IsVertical) - .AddClass("is-collapsed", IsVertical && IsCollapsed) .AddClassFromAttributes(AdditionalAttributes) .Build(); diff --git a/src/BootstrapBlazor/Components/Menu/Menu.razor.scss b/src/BootstrapBlazor/Components/Menu/Menu.razor.scss index 2d329bb7cee..615b9871cc3 100644 --- a/src/BootstrapBlazor/Components/Menu/Menu.razor.scss +++ b/src/BootstrapBlazor/Components/Menu/Menu.razor.scss @@ -180,12 +180,6 @@ background-image: none; } -@media (min-width: 768px) { - .layout-side.is-collapsed:not(:hover) .menu.is-collapsed .submenu .text { - width: 0; - } -} - .menu.is-bottom { position: absolute; bottom: 0; @@ -208,9 +202,3 @@ .menu.is-bottom .dropdown-menu-arrow:after { content: none; } - -@media (min-width: 768px) { - .is-collapsed .menu .menu-text { - opacity: 0; - } -} From a75d9d0315ab5d6cbddccde99b10b7d4cd635062 Mon Sep 17 00:00:00 2001 From: Argo-AsicoTech Date: Sat, 16 Nov 2024 10:15:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/MenuTest.cs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/test/UnitTest/Components/MenuTest.cs b/test/UnitTest/Components/MenuTest.cs index f71547c8fcb..3751d7860fe 100644 --- a/test/UnitTest/Components/MenuTest.cs +++ b/test/UnitTest/Components/MenuTest.cs @@ -216,23 +216,6 @@ public void IndentSize_Ok() Assert.Contains("padding-left: 32px;", cut.Markup); } - [Fact] - public void IsCollapsed_Ok() - { - var cut = Context.RenderComponent(pb => - { - pb.Add(m => m.Items, Items); - pb.Add(m => m.IsCollapsed, true); - }); - Assert.DoesNotContain("is-collapsed", cut.Markup); - - cut.SetParametersAndRender(pb => - { - pb.Add(m => m.IsVertical, true); - }); - Assert.Contains("is-collapsed", cut.Markup); - } - [Fact] public void IsDisabled_Ok() {