diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs index 52660c52f0..3402b92e99 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs @@ -19,7 +19,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling { public override void ConfigureBundle(BundleConfigurationContext context) { - + context.Files.AddRange(new[] + { + "/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css" + }); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/compilerconfig.json b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/compilerconfig.json index ee76e9b485..b6108a03fa 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/compilerconfig.json +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/compilerconfig.json @@ -1,3 +1,6 @@ [ - + { + "outputFile": "wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css", + "inputFile": "wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.scss" + } ] \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css new file mode 100644 index 0000000000..285b0482da --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css @@ -0,0 +1,19 @@ +.dataTable { + width: 100% !important; + border-spacing: 0 !important; } + +.table td, .table th { + padding: 8px 10px; } + +.dataTable tbody tr td button { + cursor: pointer; } + +.dataTable tbody tr td div.dropdown ul.dropdown-menu li { + cursor: pointer; + padding: 5px; } + .dataTable tbody tr td div.dropdown ul.dropdown-menu li a { + display: block; } + +.dataTable tbody tr td div.dropdown ul.dropdown-menu li:hover { + background: #f4f5f8; } + diff --git a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.min.css b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.min.css similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.min.css rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.min.css diff --git a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.less b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.scss similarity index 100% rename from modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.less rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.scss diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml index 0021c0ed3a..88018089d7 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml @@ -4,11 +4,6 @@ @using Volo.Abp.Identity.Web.Pages.Identity.Roles @model IndexModel @inject IHtmlLocalizer L -@section styles { - - - -} @section scripts { diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml index 794a842409..016456829c 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml @@ -7,12 +7,6 @@ @model IndexModel @inject IHtmlLocalizer L @inject IAuthorizationService Authorization -@section styles { - - - -} - @section scripts { diff --git a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.css b/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.css deleted file mode 100644 index 41fbd4eaf0..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.css +++ /dev/null @@ -1,21 +0,0 @@ -.dataTable { - width: 100% !important; - border-spacing: 0 !important; -} -.table td, -.table th { - padding: 8px 10px; -} -.dataTable tbody tr td button { - cursor: pointer; -} -.dataTable tbody tr td div.dropdown ul.dropdown-menu li { - cursor: pointer; - padding: 5px; -} -.dataTable tbody tr td div.dropdown ul.dropdown-menu li a { - display: block; -} -.dataTable tbody tr td div.dropdown ul.dropdown-menu li:hover { - background: #f4f5f8; -} \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.css b/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.css deleted file mode 100644 index 41fbd4eaf0..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.css +++ /dev/null @@ -1,21 +0,0 @@ -.dataTable { - width: 100% !important; - border-spacing: 0 !important; -} -.table td, -.table th { - padding: 8px 10px; -} -.dataTable tbody tr td button { - cursor: pointer; -} -.dataTable tbody tr td div.dropdown ul.dropdown-menu li { - cursor: pointer; - padding: 5px; -} -.dataTable tbody tr td div.dropdown ul.dropdown-menu li a { - display: block; -} -.dataTable tbody tr td div.dropdown ul.dropdown-menu li:hover { - background: #f4f5f8; -} \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.less b/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.less deleted file mode 100644 index 21adf56097..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.less +++ /dev/null @@ -1,39 +0,0 @@ -//TODO: This code is duplicated for other pages too. Unify them. -.dataTable { - width: 100% !important; - border-spacing: 0 !important; -} - -.table td, .table th { - padding: 8px 10px; -} - -.dataTable { - tbody { - tr { - td { - - button { - cursor: pointer; - } - - div.dropdown { - ul.dropdown-menu { - li { - cursor: pointer; - padding: 5px; - - a { - display: block; - } - } - - li:hover { - background: #f4f5f8; - } - } - } - } - } - } -} diff --git a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.min.css b/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.min.css deleted file mode 100644 index e70b9e330b..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.min.css +++ /dev/null @@ -1 +0,0 @@ -.dataTable{width:100% !important;border-spacing:0 !important;}.table td,.table th{padding:8px 10px;}.dataTable tbody tr td button{cursor:pointer;}.dataTable tbody tr td div.dropdown ul.dropdown-menu li{cursor:pointer;padding:5px;}.dataTable tbody tr td div.dropdown ul.dropdown-menu li a{display:block;}.dataTable tbody tr td div.dropdown ul.dropdown-menu li:hover{background:#f4f5f8;} \ No newline at end of file