From faa38d45cf0f9e28656b76f1d1191fe233776fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 21 May 2020 01:44:26 +0300 Subject: [PATCH] Fix for the RTL UI --- .../Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs | 6 +++++- .../Themes/Basic/Layouts/Account.cshtml | 2 -- .../Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs | 7 ++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs index a2a411e0eb..2197bd6b97 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs @@ -8,10 +8,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap { public override void ConfigureBundle(BundleConfigurationContext context) { - if(CultureHelper.IsRtl) + if (CultureHelper.IsRtl) + { context.Files.AddIfNotContains("/libs/bootstrap/css/bootstrap-rtl.css"); + } else + { context.Files.AddIfNotContains("/libs/bootstrap/css/bootstrap.css"); + } } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml index 96567083ee..d3d4dbfb10 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml @@ -24,13 +24,11 @@ Layout = null; AbpAntiForgeryManager.SetCookie(); var containerClass = ViewBag.FluidLayout == true ? "container-fluid" : "container"; //TODO: Better and type-safe options - } -"> @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Account) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs index a7adec6161..2344a154ba 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Localization/CultureHelper.cs @@ -1,6 +1,5 @@ using System; using System.Globalization; -using System.Threading; using JetBrains.Annotations; namespace Volo.Abp.Localization @@ -36,10 +35,8 @@ namespace Volo.Abp.Localization }); } - public static bool IsRtl - { - get { return CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft; } - } + public static bool IsRtl => CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft; + public static bool IsValidCultureCode(string cultureCode) { if (cultureCode.IsNullOrWhiteSpace())