Fix for the RTL UI

6 years ago · faa38d45cf
3 changed files with 7 additions and 8 deletions
--- 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");
+            }
        }
    }
 }
--- 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
-
 }

 <!DOCTYPE html>

 <html lang="@CultureInfo.CurrentCulture.Name" dir=@(CultureHelper.IsRtl ? "rtl" : "")>
-<!--<![endif]-->">
 <head>
    @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Account)

--- 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())