Merge branch 'auto-merge/rel-5-0/648' into dev

5 years ago · 4b10f7bbec
2 changed files with 5 additions and 0 deletions
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Bundling/BasicThemeGlobalStyleContributor.cs
@ -7,5 +7,6 @@ public class BasicThemeGlobalStyleContributor : BundleContributor
    public override void ConfigureBundle(BundleConfigurationContext context)
    {
        context.Files.Add("/themes/basic/layout.css");
+        context.Files.Add("/themes/basic/custom/select2-bs5-fix.css");
    }
 }
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/custom/select2-bs5-fix.css
@ -0,0 +1,4 @@
+/*TODO: Remove after BS5 Modal support of select2 */
+span.select2-container.select2-container--default.select2-container--open {
+    z-index: 1056; /*Just for BS5 Modals*/
+}