Merge pull request #4207 from abpframework/bs-rtl-change-library

Change Bootstrap RTL Library
6 years ago · 0b0c9ab8b0
7 changed files with 9459 additions and 7282 deletions
--- 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,11 +24,12 @@
    Layout = null;
    AbpAntiForgeryManager.SetCookie();
    var containerClass = ViewBag.FluidLayout == true ? "container-fluid" : "container"; //TODO: Better and type-safe options
+    var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty;
 }

 <!DOCTYPE html>

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

@ -48,7 +49,7 @@

    @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Account)
 </head>
-<body class="abp-account-layout bg-light">
+<body class="abp-account-layout bg-light @rtl">
    @await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Account)

    @(await Component.InvokeAsync<MainNavbarViewComponent>())
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml
@ -28,11 +28,13 @@

        pageTitle = PageLayout.Content.Title + pageTitle;
    }
+
+    var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty;
 }

 <!DOCTYPE html>

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

@ -50,7 +52,7 @@

    @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Application)
 </head>
-<body class="abp-application-layout bg-light">
+<body class="abp-application-layout bg-light @rtl">
    @await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Application)

    @(await Component.InvokeAsync<MainNavbarViewComponent>())
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml
@ -27,11 +27,13 @@

        pageTitle = PageLayout.Content.Title + pageTitle;
    }
+
+    var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty;
 }

 <!DOCTYPE html>

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

@ -52,7 +54,7 @@

    @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.Last, StandardLayouts.Empty)
 </head>
-<body class="abp-empty-layout">
+<body class="abp-empty-layout @rtl">
    @await Component.InvokeLayoutHookAsync(LayoutHooks.Body.First, StandardLayouts.Empty)

    <div class="@containerClass">
--- a/npm/packs/bootstrap/abp.resourcemapping.js
+++ b/npm/packs/bootstrap/abp.resourcemapping.js
@ -2,7 +2,7 @@
    mappings: {
        "@node_modules//bootstrap/dist/css/bootstrap.css*": "@libs/bootstrap/css/",
        "@node_modules//bootstrap/dist/css/bootstrap.min.css*": "@libs/bootstrap/css/",
-        "@node_modules/@laylazi/bootstrap-rtl/dist/css/bootstrap-rtl*": "@libs/bootstrap/css/",
+        "@node_modules/bootstrap-v4-rtl/dist/css/bootstrap-rtl*": "@libs/bootstrap/css/",
        "@node_modules/bootstrap/dist/js/bootstrap.bundle*": "@libs/bootstrap/js/"
    }
 }
--- a/npm/packs/bootstrap/package.json
+++ b/npm/packs/bootstrap/package.json
@ -6,7 +6,7 @@
  },
  "dependencies": {
    "@abp/core": "^2.8.0",
-    "@laylazi/bootstrap-rtl": "4.4.101",
+    "bootstrap-v4-rtl": "4.4.1-2",
    "bootstrap": "^4.3.1"
  },
  "gitHead": "40e535594fe6371da41ed3af28df92ee43def52c"
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.css
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.css
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.min.css