Adapted datatables design to material.

pull/179/head
Halil İbrahim Kalkan 8 years ago
parent 5cc3a581cd
commit fad5f849e3

@ -22,13 +22,17 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
{
options.StyleBundles.Add("GlobalStyles", new[]
{
"/styles/mybstheme.css"
"/libs/material/css/material.min.css",
"/libs/datatables/datatables.css",
"/styles/libs/datatables.css"
});
options.ScriptBundles.Add("GlobalScripts", new[]
{
"/libs/jquery/jquery-3.1.1.min.js",
"/libs/bootstrap/js/bootstrap.bundle.min.js",
"/libs/material/js/material.min.js",
"/libs/datatables/datatables.min.js",
"/libs/vue/vue.js",
"/libs/abp/abp-jquery.js?_v" + DateTime.Now.Ticks
});

@ -11,11 +11,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>ABP Web Application</title>
<!-- Add Material font (Roboto) and Material icon as needed -->
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<vc:abp-style-bundle name="GlobalStyles"></vc:abp-style-bundle>
<link rel="stylesheet" type="text/css" href="~/views/shared/_AppLayout.css"/>
@RenderSection("styles", false)
</head>
<body>

@ -12,6 +12,79 @@
<ItemGroup>
<EmbeddedResource Include="Views\Shared\Components\AbpMenu\Default.cshtml" />
<EmbeddedResource Include="Views\Shared\_AppLayout.cshtml" />
<EmbeddedResource Include="wwwroot\libs\datatables\datatables.css" />
<EmbeddedResource Include="wwwroot\libs\datatables\datatables.js" />
<EmbeddedResource Include="wwwroot\libs\datatables\datatables.min.css" />
<EmbeddedResource Include="wwwroot\libs\datatables\datatables.min.js" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Afrikaans.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Albanian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Arabic.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Armenian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Azerbaijan.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Bangla.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Basque.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Belarusian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Bulgarian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Catalan.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Chinese (Simplified, China).json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Chinese-traditional.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Croatian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Czech.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Danish.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Dutch.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\English.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Estonian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Filipino.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Finnish.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\French.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Galician.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Georgian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\German.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Greek.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Gujarati.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Hebrew.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Hindi.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Hungarian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Icelandic.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Indonesian-Alternative.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Indonesian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Irish.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Italian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Japanese.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Kazakh.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Korean.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Kyrgyz.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Latvian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Lithuanian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Macedonian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Malay.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Mongolian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Nepali.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Norwegian-Bokmal.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Norwegian-Nynorsk.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Pashto.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Persian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Polish.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Portuguese (Brazil).json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Portuguese.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Romanian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Russian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Serbian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Sinhala.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Slovak.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Slovenian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Spanish.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Swahili.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Swedish.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Tamil.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\telugu.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Thai.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Turkish.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Ukrainian.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Urdu.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Uzbek.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Vietnamese.json" />
<EmbeddedResource Include="wwwroot\libs\datatables\localizations\Welsh.json" />
<EmbeddedResource Include="wwwroot\views\shared\_AppLayout.css" />
<EmbeddedResource Include="Views\Shared\_ViewImports.cshtml" />
<EmbeddedResource Include="wwwroot\libs\jquery\jquery-3.1.1.js" />

@ -2,5 +2,9 @@
{
"outputFile": "wwwroot/styles/mybstheme.css",
"inputFile": "wwwroot/styles/mybstheme.scss"
},
{
"outputFile": "wwwroot/styles/libs/datatables.css",
"inputFile": "wwwroot/styles/libs/datatables.scss"
}
]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1,20 @@
.table tbody td, .table tbody {
height: initial;
font-size: 1em;
padding-top: 0.5em;
padding-bottom: 0.5em; }
.table td:first-child, .table th:first-child {
padding-left: 0.5em;
height: initial; }
.pagination {
background-color: initial; }
.table thead td, .table thead th {
height: initial; }
table.dataTable thead .sorting::before, table.dataTable thead .sorting_asc::before, table.dataTable thead .sorting_desc::before, table.dataTable thead .sorting_asc_disabled::before, table.dataTable thead .sorting_desc_disabled::before,
table.dataTable thead .sorting::after, table.dataTable thead .sorting_asc::after, table.dataTable thead .sorting_desc::after, table.dataTable thead .sorting_asc_disabled::after, table.dataTable thead .sorting_desc_disabled::after {
bottom: 1.5em; }

@ -0,0 +1 @@
.table tbody td,.table tbody{height:initial;font-size:1em;padding-top:.5em;padding-bottom:.5em;}.table td:first-child,.table th:first-child{padding-left:.5em;height:initial;}.pagination{background-color:initial;}.table thead td,.table thead th{height:initial;}table.dataTable thead .sorting::before,table.dataTable thead .sorting_asc::before,table.dataTable thead .sorting_desc::before,table.dataTable thead .sorting_asc_disabled::before,table.dataTable thead .sorting_desc_disabled::before,table.dataTable thead .sorting::after,table.dataTable thead .sorting_asc::after,table.dataTable thead .sorting_desc::after,table.dataTable thead .sorting_asc_disabled::after,table.dataTable thead .sorting_desc_disabled::after{bottom:1.5em;}

@ -0,0 +1,24 @@
.table tbody td, .table tbody {
height: initial;
font-size: 1em;
padding-top: 0.5em;
padding-bottom: 0.5em;
}
.table td:first-child, .table th:first-child {
padding-left: 0.5em;
height: initial;
}
.pagination {
background-color: initial;
}
.table thead td, .table thead th {
height: initial;
}
table.dataTable thead .sorting::before, table.dataTable thead .sorting_asc::before, table.dataTable thead .sorting_desc::before, table.dataTable thead .sorting_asc_disabled::before, table.dataTable thead .sorting_desc_disabled::before,
table.dataTable thead .sorting::after, table.dataTable thead .sorting_asc::after, table.dataTable thead .sorting_desc::after, table.dataTable thead .sorting_asc_disabled::after, table.dataTable thead .sorting_desc_disabled::after {
bottom: 1.5em;
}

@ -5,13 +5,11 @@
@inject IHtmlLocalizer<IdentityResource> L
@section styles {
<!-- TODO: Use minified on production, normal in development -->
<link rel="stylesheet" type="text/css" href="~/modules/identity/libs/datatables/datatables.css" />
<link rel="stylesheet" type="text/css" href="~/modules/identity/views/users/index.css" />
}
@section scripts {
<!-- TODO: Use minified on production, normal in development -->
<script type="text/javascript" src="~/modules/identity/libs/datatables/datatables.min.js"></script>
<script type="text/javascript" src="~/modules/identity/views/users/index.js"></script>
}
@ -31,7 +29,7 @@
</div>
</div>
<div class="card-body">
<table id="IdentityUsersTable" class="table table-striped table-bordered table-hover nowrap">
<table id="IdentityUsersTable" class="table table-striped nowrap">
<thead>
<tr>
<th>@L["Actions"]</th>

@ -26,4 +26,8 @@
<ProjectReference Include="..\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\modules\identity\libs\" />
</ItemGroup>
</Project>

Loading…
Cancel
Save