Skip to content

Commit 60da63d

Browse files
committed
resolved #10
1 parent 5bd1051 commit 60da63d

File tree

4 files changed

+112
-38
lines changed

4 files changed

+112
-38
lines changed

src/AbpCompanyName.AbpProjectName.Web/Views/Shared/_Layout.cshtml

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@
2929
</environment>
3030

3131
<environment names="Staging,Production">
32-
@* TODO: BUNDLE / Get from CDN ? *@
33-
34-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.6/paper/bootstrap.min.css"
35-
asp-fallback-href="~/lib/bootstrap-paper/bootstrap.min.css"
36-
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
37-
38-
<link rel="stylesheet" href="~/lib/toastr/toastr.min.css" />
39-
<link rel="stylesheet" href="~/lib/sweetalert/dist/sweetalert.css" />
40-
<link rel="stylesheet" href="~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.min.css" />
41-
<link rel="stylesheet" href="~/lib/font-awesome/css/font-awesome.min.css" />
42-
43-
<link rel="stylesheet" href="~/css/main.min.css" />
32+
<link rel="stylesheet" href="~/view-resources/Views/_Bundles/layout-libs.min.css" asp-append-version="true" />
4433
</environment>
4534

4635
<!-- View specific styles -->
@@ -110,32 +99,7 @@
11099
</environment>
111100

112101
<environment names="Staging,Production">
113-
@* TODO: BUNDLE / Get from CDN ? *@
114-
115-
<script src="~/lib/json2/json2.js"></script>
116-
117-
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
118-
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
119-
asp-fallback-test="window.jQuery">
120-
</script>
121-
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.6/bootstrap.min.js"
122-
asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
123-
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal">
124-
</script>
125-
126-
<script src="~/lib/moment/min/moment-with-locales.min.js"></script>
127-
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
128-
<script src="~/lib/blockUI/jquery.blockUI.js"></script>
129-
<script src="~/lib/toastr/toastr.min.js"></script>
130-
<script src="~/lib/sweetalert/dist/sweetalert.min.js"></script>
131-
<script src="~/lib/spin.js/spin.min.js"></script>
132-
<script src="~/lib/spin.js/jquery.spin.js"></script>
133-
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/abp.js"></script>
134-
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js"></script>
135-
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js"></script>
136-
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js"></script>
137-
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js"></script>
138-
<script src="~/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js"></script>
102+
<script src="~/view-resources/Views/_Bundles/layout-libs.min.js" asp-append-version="true"></script>
139103
</environment>
140104

141105
<script>

src/AbpCompanyName.AbpProjectName.Web/bundleconfig.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,37 @@
44
"inputFiles": [
55
"wwwroot/js/views/home/index.js"
66
]
7+
},
8+
{
9+
"outputFileName": "wwwroot/view-resources/Views/_Bundles/layout-libs.min.css",
10+
"inputFiles": [
11+
"wwwroot/lib/bootstrap-paper/bootstrap.css",
12+
"wwwroot/lib/toastr/toastr.css",
13+
"wwwroot/lib/sweetalert/dist/sweetalert.css",
14+
"wwwroot/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css",
15+
"wwwroot/lib/font-awesome/css/font-awesome.css",
16+
"wwwroot/css/main.css"
17+
]
18+
},
19+
{
20+
"outputFileName": "wwwroot/view-resources/Views/_Bundles/layout-libs.min.js",
21+
"inputFiles": [
22+
"wwwroot/lib/json2/json2.js",
23+
"wwwroot/lib/jquery/dist/jquery.js",
24+
"wwwroot/lib/bootstrap/dist/js/bootstrap.js",
25+
"wwwroot/lib/moment/min/moment-with-locales.js",
26+
"wwwroot/lib/jquery-validation/dist/jquery.validate.js",
27+
"wwwroot/lib/blockUI/jquery.blockUI.js",
28+
"wwwroot/lib/toastr/toastr.js",
29+
"wwwroot/lib/sweetalert/dist/sweetalert-dev.js",
30+
"wwwroot/lib/spin.js/spin.js",
31+
"wwwroot/lib/spin.js/jquery.spin.js",
32+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js",
33+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",
34+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.toastr.js",
35+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js",
36+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js",
37+
"wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.spin.js"
38+
]
739
}
840
]

src/AbpCompanyName.AbpProjectName.Web/wwwroot/view-resources/Views/_Bundles/layout-libs.min.css

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

src/AbpCompanyName.AbpProjectName.Web/wwwroot/view-resources/Views/_Bundles/layout-libs.min.js

Lines changed: 50 additions & 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)