Move jquery-ui-fixes to bundle

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years ago · ea951136d1
parent e65f7f05de
commit ea951136d1
12 changed files with 26 additions and 21 deletions
--- a/core/js/dist/main.js
+++ b/core/js/dist/main.js
--- a/core/js/dist/main.js.map
+++ b/core/js/dist/main.js.map
--- a/core/src/jquery/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
+++ b/core/src/jquery/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
--- a/core/src/jquery/css/images/ui-bg_flat_10_000000_40x100.png
+++ b/core/src/jquery/css/images/ui-bg_flat_10_000000_40x100.png
--- a/core/src/jquery/css/images/ui-bg_flat_35_1d2d44_40x100.png
+++ b/core/src/jquery/css/images/ui-bg_flat_35_1d2d44_40x100.png
--- a/core/src/jquery/css/images/ui-icons_1d2d44_256x240.png
+++ b/core/src/jquery/css/images/ui-icons_1d2d44_256x240.png
--- a/core/src/jquery/css/images/ui-icons_ffd27a_256x240.png
+++ b/core/src/jquery/css/images/ui-icons_ffd27a_256x240.png
--- a/core/src/jquery/css/images/ui-icons_ffffff_256x240.png
+++ b/core/src/jquery/css/images/ui-icons_ffffff_256x240.png
--- a/core/src/jquery/css/jquery-ui-fixes.scss
+++ b/core/src/jquery/css/jquery-ui-fixes.scss
--- a/core/src/jquery/index.js
+++ b/core/src/jquery/index.js
@ -30,3 +30,5 @@ import './selectrange'
 import './showpassword'
 import './tipsy'
 import './ui-fixes'
+
+import './css/jquery-ui-fixes.scss'
--- a/core/webpack.js
+++ b/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'
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@ -111,7 +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');