diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 2354e26105..d4bc21e5fe 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -176,6 +176,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Distribut EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Distributed.Tests", "test\Volo.Abp.EventBus.Distributed.Tests\Volo.Abp.EventBus.Distributed.Tests.csproj", "{0AE814CE-E155-4259-8746-262D174AB510}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", "src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj", "{2F5EE6D9-511B-4998-BD62-0B9F03E02432}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -490,6 +492,10 @@ Global {0AE814CE-E155-4259-8746-262D174AB510}.Debug|Any CPU.Build.0 = Debug|Any CPU {0AE814CE-E155-4259-8746-262D174AB510}.Release|Any CPU.ActiveCfg = Release|Any CPU {0AE814CE-E155-4259-8746-262D174AB510}.Release|Any CPU.Build.0 = Release|Any CPU + {2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -574,6 +580,7 @@ Global {CFC98B88-8CCC-469B-8D60-482D3C94A690} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {468C3DCB-8C00-40E7-AE51-0738EAAB312A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {0AE814CE-E155-4259-8746-262D174AB510} = {447C8A77-E5F0-4538-8687-7383196D04EA} + {2F5EE6D9-511B-4998-BD62-0B9F03E02432} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs index 835fafa371..d4047edb9e 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs @@ -32,7 +32,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap options.StyleBundles.Add("GlobalStyles", new[] { "/libs/font-awesome/css/font-awesome-min.css", - "/libs/material/css/material-min.css", + //"/libs/material/css/material-min.css", + "/libs/bootstrap/css/bootstrap-min.css", "/libs/datatables/datatables.css", "/styles/libs/datatables.css" }); @@ -44,7 +45,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap "/libs/jquery-validation/jquery-validate.js", "/libs/jquery-validation-unobtrusive/jquery-validate-unobtrusive.js", "/libs/jquery-form/jquery-form-min.js", - "/libs/material/js/material-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, diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/package.json b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/package.json index 7d8fa2f09f..189f0257ba 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/package.json +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/package.json @@ -1,6 +1,6 @@ { "version": "0.2.0", - "name": "volo.abp.aspnetcore.mvc.ui.bootstrap", + "name": "@abp/aspnetcore.mvc.ui.bootstrap", "private": true, "devDependencies": {}, "dependencies": { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj new file mode 100644 index 0000000000..04c04f8422 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj @@ -0,0 +1,20 @@ + + + + + + netstandard2.0 + Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic + Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + \ No newline at end of file diff --git a/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.csproj b/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.csproj index 6b76b99292..374d0b3d9e 100644 --- a/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.csproj +++ b/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.csproj @@ -14,7 +14,6 @@ -