Skip to content

Commit 0bf0c9d

Browse files
hikalkanhikalkan
committed
Update bundles.
1 parent fdb4de4 commit 0bf0c9d

File tree

7 files changed

+200
-538
lines changed

7 files changed

+200
-538
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,21 @@
2525
<title>AbpProjectName</title>
2626

2727
<environment names="Development">
28-
<!-- TODO: Bundles! -->
29-
<!-- Fonts -->
3028
<link href="~/fonts/roboto/roboto.css" rel="stylesheet" asp-append-version="true" />
3129
<link href="~/fonts/material-icons/materialicons.css" rel="stylesheet" asp-append-version="true" />
32-
33-
<!-- ~/Bundles/vendor/css -->
34-
<link rel="stylesheet" href="~/lib/jquery-ui/themes/base/all.css" asp-append-version="true" />
35-
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" asp-append-version="true" />
36-
<link rel="stylesheet" href="~/lib/toastr/toastr.css" asp-append-version="true" />
37-
<link rel="stylesheet" href="~/lib/sweetalert/dist/sweetalert.css" asp-append-version="true" />
38-
<link rel="stylesheet" href="~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css" asp-append-version="true" />
39-
<link rel="stylesheet" href="~/lib/font-awesome/css/font-awesome.css" asp-append-version="true" />
40-
<link rel="stylesheet" href="~/lib/Waves/dist/waves.css" asp-append-version="true" />
41-
<link rel="stylesheet" href="~/lib/animate.css/animate.css" asp-append-version="true" />
42-
<link href="~/css/style.css" rel="stylesheet">
43-
30+
<link href="~/lib/bootstrap/dist/css/bootstrap.css" rel="stylesheet" asp-append-version="true" />
31+
<link href="~/lib/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
32+
<link href="~/lib/sweetalert/dist/sweetalert.css" rel="stylesheet" asp-append-version="true" />
33+
<link href="~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css" rel="stylesheet" asp-append-version="true" />
34+
<link href="~/lib/font-awesome/css/font-awesome.css" rel="stylesheet" asp-append-version="true" />
35+
<link href="~/lib/Waves/dist/waves.css" rel="stylesheet" asp-append-version="true" />
36+
<link href="~/lib/animate.css/animate.css" rel="stylesheet" asp-append-version="true" />
37+
<link href="~/css/style.css" rel="stylesheet" asp-append-version="true" />
4438
<link href="~/view-resources/Views/Account/_Layout.css" rel="stylesheet" asp-append-version="true" />
4539
</environment>
4640

4741
<environment names="Staging,Production">
48-
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/layout-libs.min.css" asp-append-version="true" />
42+
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/account-layout.min.css" asp-append-version="true" />
4943
</environment>
5044

5145
<!-- View specific styles -->
@@ -86,7 +80,6 @@
8680
<environment names="Development">
8781
<script src="~/lib/json2/json2.js" asp-append-version="true"></script>
8882
<script src="~/lib/jquery/dist/jquery.js" asp-append-version="true"></script>
89-
<script src="~/lib/jquery-ui/jquery-ui.js" asp-append-version="true"></script>
9083
<script src="~/lib/bootstrap/dist/js/bootstrap.js" asp-append-version="true"></script>
9184
<script src="~/lib/moment/min/moment-with-locales.js" asp-append-version="true"></script>
9285
<script src="~/lib/jquery-validation/dist/jquery.validate.js" asp-append-version="true"></script>
@@ -95,22 +88,19 @@
9588
<script src="~/lib/sweetalert/dist/sweetalert-dev.js" asp-append-version="true"></script>
9689
<script src="~/lib/spin.js/spin.js" asp-append-version="true"></script>
9790
<script src="~/lib/spin.js/jquery.spin.js" asp-append-version="true"></script>
98-
<script src="~/lib/Waves/dist/waves.js"></script>
99-
91+
<script src="~/lib/Waves/dist/waves.js" asp-append-version="true"></script>
10092
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
10193
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
10294
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
10395
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
10496
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
10597
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
106-
107-
<script src="~/js/admin.js"></script>
98+
<script src="~/js/admin.js" asp-append-version="true"></script>
10899
<script src="~/js/main.js" asp-append-version="true"></script>
109100
</environment>
110101

111102
<environment names="Staging,Production">
112-
<script src="~/view-resources/Views/_Bundles/layout-libs.min.js" asp-append-version="true"></script>
113-
<script src="~/js/main.min.js" asp-append-version="true"></script>
103+
<script src="~/view-resources/Views/_Bundles/account-layout.min.js" asp-append-version="true"></script>
114104
</environment>
115105

116106
<script>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<title>AbpProjectName</title>
3232

3333
<environment names="Development">
34-
<!-- ~/Bundles/vendor/css TODO: Update bundle! -->
3534
<link href="~/fonts/roboto/roboto.css" rel="stylesheet" asp-append-version="true" />
3635
<link href="~/fonts/material-icons/materialicons.css" rel="stylesheet" asp-append-version="true" />
3736
<link href="~/lib/bootstrap/dist/css/bootstrap.css" rel="stylesheet" asp-append-version="true" />
@@ -48,7 +47,7 @@
4847
</environment>
4948

5049
<environment names="Staging,Production">
51-
<link href="~/view-resources/Views/_Bundles/layout-libs.min.css" rel="stylesheet" asp-append-version="true" />
50+
<link href="~/view-resources/Views/_Bundles/shared-layout.min.css" rel="stylesheet" asp-append-version="true" />
5251
</environment>
5352

5453
<!-- View specific styles -->
@@ -279,18 +278,16 @@
279278
</aside>
280279
<!-- #END# Right Sidebar -->
281280
</section>
281+
282282
<section class="content">
283283
<div class="container-fluid">
284284
@RenderBody()
285285
</div>
286286
</section>
287287

288-
289288
<environment names="Development">
290-
<!-- TODO: Update bundles -->
291289
<script src="~/lib/json2/json2.js" asp-append-version="true"></script>
292290
<script src="~/lib/jquery/dist/jquery.js" asp-append-version="true"></script>
293-
<script src="~/lib/jquery-ui/jquery-ui.js" asp-append-version="true"></script>
294291
<script src="~/lib/bootstrap/dist/js/bootstrap.js" asp-append-version="true"></script>
295292
<script src="~/lib/moment/min/moment-with-locales.js" asp-append-version="true"></script>
296293
<script src="~/lib/jquery-validation/dist/jquery.validate.js" asp-append-version="true"></script>
@@ -299,31 +296,28 @@
299296
<script src="~/lib/sweetalert/dist/sweetalert-dev.js" asp-append-version="true"></script>
300297
<script src="~/lib/spin.js/spin.js" asp-append-version="true"></script>
301298
<script src="~/lib/spin.js/jquery.spin.js" asp-append-version="true"></script>
302-
<script src="~/lib/bootstrap-select/dist/js/bootstrap-select.js"></script>
303-
<script src="~/lib/jquery-slimscroll/jquery.slimscroll.js"></script>
304-
<script src="~/lib/Waves/dist/waves.js"></script>
299+
<script src="~/lib/bootstrap-select/dist/js/bootstrap-select.js" asp-append-version="true"></script>
300+
<script src="~/lib/jquery-slimscroll/jquery.slimscroll.js" asp-append-version="true"></script>
301+
<script src="~/lib/Waves/dist/waves.js" asp-append-version="true"></script>
305302
<script src="~/lib/push.js/push.js" asp-append-version="true"></script>
306-
307303
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>
308304
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js" asp-append-version="true"></script>
309305
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js" asp-append-version="true"></script>
310306
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js" asp-append-version="true"></script>
311307
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js" asp-append-version="true"></script>
312308
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js" asp-append-version="true"></script>
313-
309+
<script src="~/js/admin.js"></script>
310+
<script src="~/js/demo.js"></script>
311+
<script src="~/js/main.js" asp-append-version="true"></script>
312+
314313
@if (SignalRFeature.IsAvailable)
315314
{
316315
<script src="~/lib/signalr/jquery.signalR.js" asp-append-version="true"></script>
317316
}
318-
319-
<script src="~/js/admin.js"></script>
320-
<script src="~/js/demo.js"></script>
321-
322-
<script src="~/js/main.js" asp-append-version="true"></script>
323317
</environment>
324318

325319
<environment names="Staging,Production">
326-
<script src="~/view-resources/Views/_Bundles/layout-libs.min.js" asp-append-version="true"></script>
320+
<script src="~/view-resources/Views/_Bundles/shared-layout.min.js" asp-append-version="true"></script>
327321
<script src="~/js/main.min.js" asp-append-version="true"></script>
328322
</environment>
329323

@@ -338,7 +332,7 @@
338332

339333
@if (SignalRFeature.IsAvailable)
340334
{
341-
<!-- SignalR scripts -->
335+
<!-- SignalR scripts -->
342336
<script src="~/signalr/hubs"></script>
343337
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.js" type="text/javascript"></script>
344338
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bundleconfig.json

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,63 @@
11
[
22
{
3-
"outputFileName": "wwwroot/js/views/home/index.min.js",
3+
"outputFileName": "wwwroot/view-resources/Views/_Bundles/account-layout.min.css",
44
"inputFiles": [
5-
"wwwroot/js/views/home/index.js"
5+
"wwwroot/lib/bootstrap/dist/css/bootstrap.css",
6+
"wwwroot/lib/toastr/toastr.css",
7+
"wwwroot/lib/sweetalert/dist/sweetalert.css",
8+
"wwwroot/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css",
9+
"wwwroot/lib/font-awesome/css/font-awesome.css",
10+
"wwwroot/lib/Waves/dist/waves.css",
11+
"wwwroot/lib/animate.css/animate.css",
12+
"wwwroot/css/style.css",
13+
"wwwroot/view-resources/Views/Account/_Layout.css"
14+
]
15+
},
16+
{
17+
"outputFileName": "wwwroot/view-resources/Views/_Bundles/account-layout.min.js",
18+
"inputFiles": [
19+
"wwwroot/lib/json2/json2.js",
20+
"wwwroot/lib/jquery/dist/jquery.js",
21+
"wwwroot/lib/bootstrap/dist/js/bootstrap.js",
22+
"wwwroot/lib/moment/min/moment-with-locales.js",
23+
"wwwroot/lib/jquery-validation/dist/jquery.validate.js",
24+
"wwwroot/lib/blockUI/jquery.blockUI.js",
25+
"wwwroot/lib/toastr/toastr.js",
26+
"wwwroot/lib/sweetalert/dist/sweetalert-dev.js",
27+
"wwwroot/lib/spin.js/spin.js",
28+
"wwwroot/lib/spin.js/jquery.spin.js",
29+
"wwwroot/lib/Waves/dist/waves.js",
30+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js",
31+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
32+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
33+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
34+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
35+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
36+
"wwwroot/js/admin.js",
37+
"wwwroot/js/main.js"
638
]
739
},
840
{
9-
"outputFileName": "wwwroot/view-resources/Views/_Bundles/layout-libs.min.css",
41+
"outputFileName": "wwwroot/view-resources/Views/_Bundles/shared-layout.min.css",
1042
"inputFiles": [
11-
"wwwroot/lib/jquery-ui/themes/base/all.css",
12-
"wwwroot/lib/bootstrap-theme-cosmo/cosmo.min.css",
43+
"wwwroot/lib/bootstrap/dist/css/bootstrap.css",
44+
"wwwroot/lib/bootstrap-select/dist/css/bootstrap-select.css",
1345
"wwwroot/lib/toastr/toastr.css",
1446
"wwwroot/lib/sweetalert/dist/sweetalert.css",
1547
"wwwroot/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css",
1648
"wwwroot/lib/font-awesome/css/font-awesome.css",
17-
"wwwroot/css/main.css"
49+
"wwwroot/lib/Waves/dist/waves.css",
50+
"wwwroot/lib/animate.css/animate.css",
51+
"wwwroot/css/style.css",
52+
"wwwroot/css/themes/all-themes.css",
53+
"wwwroot/view-resources/Views/Shared/_Layout.css"
1854
]
1955
},
2056
{
21-
"outputFileName": "wwwroot/view-resources/Views/_Bundles/layout-libs.min.js",
57+
"outputFileName": "wwwroot/view-resources/Views/_Bundles/shared-layout.min.js",
2258
"inputFiles": [
2359
"wwwroot/lib/json2/json2.js",
2460
"wwwroot/lib/jquery/dist/jquery.js",
25-
"wwwroot/lib/jquery-ui/jquery-ui.js",
2661
"wwwroot/lib/bootstrap/dist/js/bootstrap.js",
2762
"wwwroot/lib/moment/min/moment-with-locales.js",
2863
"wwwroot/lib/jquery-validation/dist/jquery.validate.js",
@@ -31,13 +66,25 @@
3166
"wwwroot/lib/sweetalert/dist/sweetalert-dev.js",
3267
"wwwroot/lib/spin.js/spin.js",
3368
"wwwroot/lib/spin.js/jquery.spin.js",
69+
"wwwroot/lib/bootstrap-select/dist/js/bootstrap-select.js",
70+
"wwwroot/lib/jquery-slimscroll/jquery.slimscroll.js",
71+
"wwwroot/lib/Waves/dist/waves.js",
72+
"wwwroot/lib/push.js/push.js",
3473
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js",
3574
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
3675
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
3776
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
38-
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
3977
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js",
40-
"wwwroot/lib/signalr/jquery.signalR.js"
78+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
79+
"wwwroot/js/admin.js",
80+
"wwwroot/js/demo.js",
81+
"wwwroot/js/main.js"
82+
]
83+
},
84+
{
85+
"outputFileName": "wwwroot/js/views/home/index.min.js",
86+
"inputFiles": [
87+
"wwwroot/js/views/home/index.js"
4188
]
4289
},
4390
{

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/_Bundles/account-layout.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)