Merge pull request #14199 from nextcloud/enh/core_scss_to_webpack
Move 2 always loaded styles to webpack bundle
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 157 B |
Before Width: | Height: | Size: 86 B After Width: | Height: | Size: 86 B |
Before Width: | Height: | Size: 86 B After Width: | Height: | Size: 86 B |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
|
@ -30,3 +30,6 @@ import './selectrange'
|
||||||
import './showpassword'
|
import './showpassword'
|
||||||
import './tipsy'
|
import './tipsy'
|
||||||
import './ui-fixes'
|
import './ui-fixes'
|
||||||
|
|
||||||
|
import './css/jquery-ui-fixes.scss'
|
||||||
|
import './css/jquery.ocdialog.scss'
|
||||||
|
|
|
@ -16,6 +16,10 @@ module.exports = [
|
||||||
test: /\.css$/,
|
test: /\.css$/,
|
||||||
use: ['style-loader', 'css-loader']
|
use: ['style-loader', 'css-loader']
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
test: /\.scss$/,
|
||||||
|
use: ['style-loader', 'css-loader', 'sass-loader']
|
||||||
|
},
|
||||||
{
|
{
|
||||||
test: /davclient/,
|
test: /davclient/,
|
||||||
use: 'exports-loader?dav'
|
use: 'exports-loader?dav'
|
||||||
|
|
|
@ -111,8 +111,6 @@ class OC_Template extends \OC\Template\Base {
|
||||||
|
|
||||||
OC_Util::addStyle('css-variables', null, true);
|
OC_Util::addStyle('css-variables', null, true);
|
||||||
OC_Util::addStyle('server', 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::addTranslations("core", null, true);
|
||||||
OC_Util::addStyle('search', 'results');
|
OC_Util::addStyle('search', 'results');
|
||||||
OC_Util::addScript('search', 'search', true);
|
OC_Util::addScript('search', 'search', true);
|
||||||
|
|