Browse Source

Add datatables styles to global bundle of the shared theme.

pull/335/head
Halil ibrahim Kalkan 8 years ago
parent
commit
51c4967721
  1. 5
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs
  2. 5
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/compilerconfig.json
  3. 19
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css
  4. 0
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.min.css
  5. 0
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.scss
  6. 5
      modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
  7. 6
      modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
  8. 21
      modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.css
  9. 21
      modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.css
  10. 39
      modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.less
  11. 1
      modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.min.css

5
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"
});
}
}
}

5
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"
}
]

19
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; }

0
modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.min.css → framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.min.css

0
modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.less → framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.scss

5
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<IdentityResource> L
@section styles {
<abp-style-bundle name="@typeof(IndexModel).FullName">
<abp-style src="/pages/identity/roles/index.css" />
</abp-style-bundle>
}
@section scripts {
<abp-script-bundle name="@typeof(IndexModel).FullName">
<abp-script src="/pages/abp-permission-management/permission-management-modal.js" />

6
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml

@ -7,12 +7,6 @@
@model IndexModel
@inject IHtmlLocalizer<IdentityResource> L
@inject IAuthorizationService Authorization
@section styles {
<abp-style-bundle name="@typeof(IndexModel).FullName">
<abp-style src="/pages/identity/users/index.css" />
</abp-style-bundle>
}
@section scripts {
<abp-script-bundle name="@typeof(IndexModel).FullName">
<abp-script src="/pages/abp-permission-management/permission-management-modal.js" />

21
modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/roles/index.css

@ -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;
}

21
modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.css

@ -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;
}

39
modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.less

@ -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;
}
}
}
}
}
}
}

1
modules/identity/src/Volo.Abp.Identity.Web/wwwroot/pages/identity/users/index.min.css

@ -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;}
Loading…
Cancel
Save