Skip to content

Commit 0380faf

Browse files
committed
Fixed bundle problem. removed @import from style.css
1 parent 0bf0c9d commit 0380faf

File tree

6 files changed

+104
-2
lines changed

6 files changed

+104
-2
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,9 @@
7171
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" />
7272
</ItemGroup>
7373

74+
<ItemGroup>
75+
<Folder Include="wwwroot\view-resources\Views\_Bundles\" />
76+
<Folder Include="wwwroot\view-resources\Views\_Bundles\" />
77+
</ItemGroup>
78+
7479
</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<link href="~/lib/font-awesome/css/font-awesome.css" rel="stylesheet" asp-append-version="true" />
3535
<link href="~/lib/Waves/dist/waves.css" rel="stylesheet" asp-append-version="true" />
3636
<link href="~/lib/animate.css/animate.css" rel="stylesheet" asp-append-version="true" />
37+
<link href="~/css/materialize.css" rel="stylesheet" asp-append-version="true" />
3738
<link href="~/css/style.css" rel="stylesheet" asp-append-version="true" />
3839
<link href="~/view-resources/Views/Account/_Layout.css" rel="stylesheet" asp-append-version="true" />
3940
</environment>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
{
33
"outputFileName": "wwwroot/view-resources/Views/_Bundles/account-layout.min.css",
44
"inputFiles": [
5+
"wwwroot/fonts/roboto/roboto.css",
6+
"wwwroot/fonts/material-icons/materialicons.css",
57
"wwwroot/lib/bootstrap/dist/css/bootstrap.css",
68
"wwwroot/lib/toastr/toastr.css",
79
"wwwroot/lib/sweetalert/dist/sweetalert.css",
810
"wwwroot/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css",
911
"wwwroot/lib/font-awesome/css/font-awesome.css",
1012
"wwwroot/lib/Waves/dist/waves.css",
1113
"wwwroot/lib/animate.css/animate.css",
14+
"wwwroot/css/materialize.css",
1215
"wwwroot/css/style.css",
1316
"wwwroot/view-resources/Views/Account/_Layout.css"
1417
]
@@ -48,6 +51,7 @@
4851
"wwwroot/lib/font-awesome/css/font-awesome.css",
4952
"wwwroot/lib/Waves/dist/waves.css",
5053
"wwwroot/lib/animate.css/animate.css",
54+
"wwwroot/css/materialize.css",
5155
"wwwroot/css/style.css",
5256
"wwwroot/css/themes/all-themes.css",
5357
"wwwroot/view-resources/Views/Shared/_Layout.css"

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/style.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Navbar ====================================== */
2-
@import url(materialize.css);
32
.navbar {
43
font-family: "Roboto", sans-serif;
54
-webkit-border-radius: 0;

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

Lines changed: 44 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

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)