Merge pull request #14199 from nextcloud/enh/core_scss_to_webpack

Move 2 always loaded styles to webpack bundle

core/src/jquery/index.js

@@ -30,3 +30,6 @@ import './selectrange'
 import './showpassword'
 import './tipsy'
 import './ui-fixes'
+
+import './css/jquery-ui-fixes.scss'
+import './css/jquery.ocdialog.scss'

core/webpack.js

@@ -16,6 +16,10 @@ module.exports = [
 					test: /\.css$/,
 					use: ['style-loader', 'css-loader']
 				},
+				{
+					test: /\.scss$/,
+					use: ['style-loader', 'css-loader', 'sass-loader']
+				},
 				{
 					test: /davclient/,
 					use: 'exports-loader?dav'

lib/private/legacy/template.php

@@ -111,8 +111,6 @@ class OC_Template extends \OC\Template\Base {
 
 			OC_Util::addStyle('css-variables', null, true);
 			OC_Util::addStyle('server', null, true);
-			OC_Util::addStyle('jquery-ui-fixes',null,true);
-			OC_Util::addStyle('jquery.ocdialog');
 			OC_Util::addTranslations("core", null, true);
 			OC_Util::addStyle('search', 'results');
 			OC_Util::addScript('search', 'search', true);