From c06e4edb22d2bcc6394e0d8e6d1d67676ceb7ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 11 Mar 2021 11:06:56 +0300
Subject: [PATCH] Fix setting management dependency problem and top menu items.

---
 .../Themes/Basic/SecondLevelNavMenuItem.razor  | 18 +++++++++---------
 .../AbpSettingManagementBlazorModule.cs        |  3 +--
 .../Volo.Abp.SettingManagement.Blazor.csproj   |  3 +--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor b/framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
index 9e5216fc46..bf04df7019 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
@@ -12,12 +12,11 @@
         <a class="dropdown-item @cssClass @disabled" href="@url" target="@MenuItem.Target" id="@elementId">
             @if (MenuItem.Icon != null)
             {
-                if (MenuItem.Icon.StartsWith("fa"))
-                {
-                    <i class="@MenuItem.Icon"></i>
-                }
+                <i class="@MenuItem.Icon mr-1"></i>
             }
-            @MenuItem.DisplayName
+            <span>
+                @MenuItem.DisplayName
+            </span>
         </a>
     }
 }
@@ -26,10 +25,11 @@ else
     <div class="dropdown-submenu">
         <a role="button" @onclick="ToggleSubMenu" class="btn dropdown-toggle" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="false">
-            <span class="lp-icon">
-                <i class="@(MenuItem.Icon ?? "")"></i>
-            </span>
-            <span class="lp-text">
+            @if (MenuItem.Icon != null)
+            {
+                <i class="@MenuItem.Icon mr-1"></i>
+            }
+            <span>
                 @MenuItem.DisplayName
             </span>
         </a>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs
index 041cfdbf70..45888f847e 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs
@@ -12,8 +12,7 @@ namespace Volo.Abp.SettingManagement.Blazor
     [DependsOn(
         typeof(AbpAutoMapperModule),
         typeof(AbpAspNetCoreComponentsWebThemingModule),
-        typeof(AbpSettingManagementDomainSharedModule),
-        typeof(AbpSettingManagementHttpApiClientModule)
+        typeof(AbpSettingManagementApplicationContractsModule)
     )]
     public class AbpSettingManagementBlazorModule : AbpModule
     {
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj
index a93b400ecf..20395efc09 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj
@@ -14,7 +14,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Volo.Abp.SettingManagement.HttpApi.Client\Volo.Abp.SettingManagement.HttpApi.Client.csproj" />
-        <ProjectReference Include="..\Volo.Abp.SettingManagement.Domain.Shared\Volo.Abp.SettingManagement.Domain.Shared.csproj" />
+        <ProjectReference Include="..\Volo.Abp.SettingManagement.Application.Contracts\Volo.Abp.SettingManagement.Application.Contracts.csproj" />
     </ItemGroup>
 </Project>