diff --git a/Build/BuildScripts/Package.targets b/Build/BuildScripts/Package.targets index 579690d70..17d338a02 100644 --- a/Build/BuildScripts/Package.targets +++ b/Build/BuildScripts/Package.targets @@ -2,9 +2,14 @@ $(BuildScriptsPath)\DotNetNuke.MSBuild.Tasks.dll + $(BuildScriptsPath)\Yahoo.Yui.Compressor.MsBuild.dll + + + + - - java -jar "$(BuildScriptsPath)\yuicompressor.jar" - - <_JSFilesToMinify Include="$(MSBuildProjectDirectory)\Package\Resources\**\*.js" Exclude="$(MSBuildProjectDirectory)\Package\Resources\**\*.min.js" /> + <_Step2FilesToZip Include="$(MSBuildProjectDirectory)\Package\Resources\**\*" /> + + + --> <_CSSFilesToCompress Include="$(MSBuildProjectDirectory)\**\*.css" Exclude="$(MSBuildProjectDirectory)\Package\**\*;$(MSBuildProjectDirectory)\**\node_modules\**\*" /> - + + - \ No newline at end of file + diff --git a/Build/BuildScripts/Yahoo.Yui.Compressor.MsBuild.dll b/Build/BuildScripts/Yahoo.Yui.Compressor.MsBuild.dll new file mode 100644 index 000000000..7f73ac31c Binary files /dev/null and b/Build/BuildScripts/Yahoo.Yui.Compressor.MsBuild.dll differ diff --git a/Build/BuildScripts/Yahoo.Yui.Compressor.dll b/Build/BuildScripts/Yahoo.Yui.Compressor.dll new file mode 100644 index 000000000..e8c5faa0c Binary files /dev/null and b/Build/BuildScripts/Yahoo.Yui.Compressor.dll differ diff --git a/Build/BuildScripts/yuicompressor.jar b/Build/BuildScripts/yuicompressor.jar deleted file mode 100644 index a1cf0a092..000000000 Binary files a/Build/BuildScripts/yuicompressor.jar and /dev/null differ diff --git a/Extensions/Manage/Dnn.PersonaBar.Roles/Dnn.PersonaBar.Roles.csproj b/Extensions/Manage/Dnn.PersonaBar.Roles/Dnn.PersonaBar.Roles.csproj index 2783f0922..b81d45961 100644 --- a/Extensions/Manage/Dnn.PersonaBar.Roles/Dnn.PersonaBar.Roles.csproj +++ b/Extensions/Manage/Dnn.PersonaBar.Roles/Dnn.PersonaBar.Roles.csproj @@ -115,7 +115,6 @@ - @@ -154,4 +153,4 @@ - \ No newline at end of file + diff --git a/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/src/globals/application.js b/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/src/globals/application.js index f59a885ef..57017db8e 100644 --- a/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/src/globals/application.js +++ b/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/src/globals/application.js @@ -10,9 +10,6 @@ const boilerPlate = { utilities.init(options.utility); utilities.moduleName = options.moduleName; utilities.settings = options.settings; - // delay the styles loading after the __webpack_public_path__ is set - // this allows the fonts associated to be loaded properly in production - require("../less/style.less"); }, dispatch() { throw new Error("dispatch method needs to be overwritten from the Redux store"); diff --git a/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/src/less/style.less b/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/src/less/style.less deleted file mode 100644 index e69de29bb..000000000 diff --git a/Extensions/Manage/Dnn.PersonaBar.Roles/admin/personaBar/css/Roles.css b/Extensions/Manage/Dnn.PersonaBar.Roles/admin/personaBar/css/Roles.css deleted file mode 100644 index 5f282702b..000000000 --- a/Extensions/Manage/Dnn.PersonaBar.Roles/admin/personaBar/css/Roles.css +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file