summaryrefslogtreecommitdiffstats
path: root/apps/files/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-21 16:35:31 +0100
committerLukas Reschke <lukas@statuscode.ch>2017-03-21 16:35:31 +0100
commit5c7ad6d3ec91ee81012b2888017b95fccafea422 (patch)
tree8bd90cddf99e7fa95c57bc6e0c82625d4ef5fef8 /apps/files/lib
parent7e958370970368d142cf65cdfe3e9191dcc34766 (diff)
downloadnextcloud-server-5c7ad6d3ec91ee81012b2888017b95fccafea422.tar.gz
nextcloud-server-5c7ad6d3ec91ee81012b2888017b95fccafea422.zip
Merge some CSS files using our SCSS compiler
This saves around 4 requests on the average page load. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'apps/files/lib')
-rw-r--r--apps/files/lib/Controller/ViewController.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 788840ff1cc..a1f01cb8a38 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -152,9 +152,6 @@ class ViewController extends Controller {
$nav = new \OCP\Template('files', 'appnavigation', '');
// Load the files we need
- \OCP\Util::addStyle('files', 'files');
- \OCP\Util::addStyle('files', 'upload');
- \OCP\Util::addStyle('files', 'mobile');
\OCP\Util::addScript('files', 'app');
\OCP\Util::addScript('files', 'file-upload');
\OCP\Util::addScript('files', 'newfilemenu');
@@ -179,7 +176,7 @@ class ViewController extends Controller {
\OCP\Util::addScript('files', 'detailtabview');
\OCP\Util::addScript('files', 'mainfileinfodetailview');
\OCP\Util::addScript('files', 'detailsview');
- \OCP\Util::addStyle('files', 'detailsView');
+ \OCP\Util::addStyle('files', 'merged');
\OC_Util::addVendorScript('core', 'handlebars/handlebars');