yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10028 from kjac/netcore/feature/avoid-css-minification-runtime

Browse Source 
Do not apply runtime optimization to core CSS and CSS libraries
This commit is contained in:
Mole
2021-03-23 15:27:45 +01:00
committed by GitHub
parent c487937f1d a55a0c9e2d
commit 1d8f9fc1e0
8 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
View File

@@ -48,19 +48,18 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
{
// Create bundles
// TODO: I think we don't want to optimize these css if/when we get gulp to do that all for us
_runtimeMinifier.CreateCssBundle(UmbracoInitCssBundleName, true,
_runtimeMinifier.CreateCssBundle(UmbracoInitCssBundleName, false,
FormatPaths("lib/bootstrap-social/bootstrap-social.css",
"assets/css/umbraco.css",
"assets/css/umbraco.min.css",
"lib/font-awesome/css/font-awesome.min.css"));
_runtimeMinifier.CreateCssBundle(UmbracoUpgradeCssBundleName, true,
FormatPaths("assets/css/umbraco.css",
_runtimeMinifier.CreateCssBundle(UmbracoUpgradeCssBundleName, false,
FormatPaths("assets/css/umbraco.min.css",
"lib/bootstrap-social/bootstrap-social.css",
"lib/font-awesome/css/font-awesome.min.css"));
_runtimeMinifier.CreateCssBundle(UmbracoPreviewCssBundleName, true,
FormatPaths("assets/css/canvasdesigner.css"));
_runtimeMinifier.CreateCssBundle(UmbracoPreviewCssBundleName, false,
FormatPaths("assets/css/canvasdesigner.min.css"));
_runtimeMinifier.CreateJsBundle(UmbracoPreviewJsBundleName, false,
FormatPaths(GetScriptsForPreview()));

6
src/Umbraco.Web.UI.Client/gulp/config.js
View File

@@ -23,10 +23,10 @@ module.exports = {
// less files used by backoffice and preview
// processed in the less task
less: {
installer: { files: "./src/less/installer.less", watch: "./src/less/**/*.less", out: "installer.css" },
installer: { files: "./src/less/installer.less", watch: "./src/less/**/*.less", out: "installer.min.css" },
nonodes: { files: "./src/less/pages/nonodes.less", watch: "./src/less/**/*.less", out: "nonodes.style.min.css"},
preview: { files: "./src/less/canvas-designer.less", watch: "./src/less/**/*.less", out: "canvasdesigner.css" },
umbraco: { files: "./src/less/belle.less", watch: "./src/**/*.less", out: "umbraco.css" },
preview: { files: "./src/less/canvas-designer.less", watch: "./src/less/**/*.less", out: "canvasdesigner.min.css" },
umbraco: { files: "./src/less/belle.less", watch: "./src/**/*.less", out: "umbraco.min.css" },
rteContent: { files: "./src/less/rte-content.less", watch: "./src/less/**/*.less", out: "rte-content.css" }
},

4
src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
View File

@@ -178,7 +178,7 @@ function dependencies() {
"name": "flatpickr",
"src": [
"./node_modules/flatpickr/dist/flatpickr.min.js",
"./node_modules/flatpickr/dist/flatpickr.css",
"./node_modules/flatpickr/dist/flatpickr.min.css",
"./node_modules/flatpickr/dist/l10n/*.js"
],
"base": "./node_modules/flatpickr/dist"
@@ -248,7 +248,7 @@ function dependencies() {
"name": "spectrum",
"src": [
"./node_modules/spectrum-colorpicker2/dist/spectrum.js",
"./node_modules/spectrum-colorpicker2/dist/spectrum.css"
"./node_modules/spectrum-colorpicker2/dist/spectrum.min.css"
],
"base": "./node_modules/spectrum-colorpicker2/dist"
},

4
src/Umbraco.Web.UI.Client/src/common/directives/components/umbcolorpicker.directive.js
View File

@@ -1,4 +1,4 @@
/**
/**
@ngdoc directive
@name umbraco.directives.directive:umbColorPicker
@restrict E
@@ -84,7 +84,7 @@
ctrl.$onInit = function () {
// load the separate css for the editor to avoid it blocking our js loading
assetsService.loadCss("lib/spectrum/spectrum.css", $scope);
assetsService.loadCss("lib/spectrum/spectrum.min.css", $scope);
// load the js file for the color picker
assetsService.load([

2
src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
View File

@@ -100,7 +100,7 @@ Use this directive to render a date time picker
ctrl.$onInit = function () {
// load css file for the date picker
assetsService.loadCss('lib/flatpickr/flatpickr.css', $scope).then(function () {
assetsService.loadCss('lib/flatpickr/flatpickr.min.css', $scope).then(function () {
userService.getCurrentUser().then(function (user) {
// init date picker

4
src/Umbraco.Web.UI.Client/src/index.html
View File

@@ -1,4 +1,4 @@
<!doctype html>
<!doctype html>
<html lang="en">
<head>
<base href="/belle/" />
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title ng-bind="locationTitle">Umbraco</title>
<link rel="stylesheet" href="assets/css/umbraco.css" />
<link rel="stylesheet" href="assets/css/umbraco.min.css" />
</head>
<body ng-class="{touch:touchDevice,emptySection:emptySection}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">

2
src/Umbraco.Web.UI.Client/src/views/content/umbpreview.html
View File

@@ -2,7 +2,7 @@
<html>
<head>
<title>Loading</title>
<link href="/umbraco/assets/css/umbraco.css" type="text/css" rel="stylesheet">
<link href="/umbraco/assets/css/umbraco.min.css" type="text/css" rel="stylesheet">
</head>
<body class="content-column-body">
</body>

2
src/Umbraco.Web.UI.NetCore/umbraco/UmbracoInstall/Index.cshtml
View File

@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Install Umbraco</title>
<link rel="stylesheet" href="assets/css/installer.css" />
<link rel="stylesheet" href="assets/css/installer.min.css" />
</head>
<body ng-class="{loading:installer.loading}" ng-controller="Umbraco.InstallerController" id="umbracoInstallPageBody">