From c90b37303640adda0d6aef93d5556d9be2bf92e2 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Wed, 7 May 2025 11:44:55 +0800
Subject: [PATCH 1/2] Enhance layout of feature and setting management modals.

---
 .../Components/FeatureManagementModal.razor     | 14 ++++++++------
 .../FeatureManagementModal.cshtml               |  1 +
 .../feature-management-modal.css                |  3 +++
 .../SettingManagement/SettingManagement.razor   | 17 +++++++++--------
 .../Pages/SettingManagement/Index.cshtml        |  2 +-
 5 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.css

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
index 77f5018e10..a0e0fad412 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
@@ -17,12 +17,14 @@
             <ModalBody>
                 <Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName">
                     <Items>
-                        @foreach (var group in Groups)
-                        {
-                            <Tab Name="@GetNormalizedGroupName(group.Name)">
-                                <span>@group.DisplayName</span>
-                            </Tab>
-                        }
+                        <div class="pt-3">
+                            @foreach (var group in Groups)
+                            {
+                                <Tab Name="@GetNormalizedGroupName(group.Name)">
+                                    <span>@group.DisplayName</span>
+                                </Tab>
+                            }
+                        </div>
                     </Items>
                     <Content>
                         @for (var i = 0; i < Groups.Count; i++)
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
index 9c3ceca88f..015d5a26e5 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -20,6 +20,7 @@
     }
 }
 
+<abp-style src="/Pages/FeatureManagement/feature-management-modal.css"/>
 <abp-script src="/Pages/FeatureManagement/feature-management-modal.js" />
 
 <form method="post" asp-page="/FeatureManagement/FeatureManagementModal" data-script-class="abp.modals.FeatureManagement" id="FeatureManagementForm">
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.css b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.css
new file mode 100644
index 0000000000..04004e6218
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.css
@@ -0,0 +1,3 @@
+#FeaturesTabsContent {
+    padding-top: 0 !important;
+}
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
index e3ab222ccf..6fb9445860 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
@@ -11,21 +11,22 @@
 </PageHeader>
 
 <Card>
-    <CardBody>
+    <CardBody Class="pt-0">
         <Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Start" Pills="true" RenderMode="TabsRenderMode.LazyReload" VerticalItemsColumnSize="ColumnSize.Is3.OnDesktop.Is6.OnTablet.Is12.OnMobile">
             <Items>
-                @foreach (var group in SettingComponentCreationContext.Groups)
-                {
-                    <Tab Name="@GetNormalizedString(group.Id)">
-                        @group.DisplayName
-                    </Tab>
-                }
+                <div class="pt-3">
+                    @foreach (var group in SettingComponentCreationContext.Groups)
+                    {
+                        <Tab Name="@GetNormalizedString(group.Id)">
+                            @group.DisplayName
+                        </Tab>
+                    }
+                </div>
             </Items>
             <Content>
                 @foreach (var group in SettingComponentCreationContext.Groups)
                 {
                     <TabPanel Name="@GetNormalizedString(group.Id)" class="abp-md-form">
-                       
                         @{
                             SettingItemRenders.Add(builder =>
                             {
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml
index 7fa674f4be..d31670a036 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml
@@ -35,7 +35,7 @@
                     </ul>
                 </div>
                 <div class="col-md-9">
-                    <div class="tab-content" id="tab-content">
+                    <div class="tab-content pt-0" id="tab-content">
                     </div>
                 </div>
             </div>

From 59f55f91d66232777d02fec5f0f8a7a7559ee48b Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 7 May 2025 11:47:45 +0800
Subject: [PATCH 2/2] Update FeatureManagementModal.cshtml

---
 .../Pages/FeatureManagement/FeatureManagementModal.cshtml        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
index d4d7d38f52..f9823e0e58 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -20,7 +20,6 @@
     }
 }
 
-<abp-style src="/Pages/FeatureManagement/feature-management-modal.css"/>
 <abp-script src="/Pages/FeatureManagement/feature-management-modal.js" />
 <abp-style src="/Pages/FeatureManagement/feature-management-modal.css" />