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>

15 files changed, 13 insertions, 13 deletions

diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 2bb4d98c158..d956a237767 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman, Vincent Petry</author>
 	<default_enable/>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<types>
 		<filesystem/>
 	</types>
diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.scss
index cab6a684042..cab6a684042 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.scss
diff --git a/apps/files/css/files.css b/apps/files/css/files.scss
index 54ed05385fa..54ed05385fa 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.scss
diff --git a/apps/files/css/merged.scss b/apps/files/css/merged.scss
new file mode 100644
index 00000000000..d65bac512f1
--- /dev/null
+++ b/apps/files/css/merged.scss
@@ -0,0 +1,4 @@
+@import 'files.scss';
+@import 'upload.scss';
+@import 'mobile.scss';
+@import 'detailsView.scss';
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.scss
index 4a5abd2b73c..4a5abd2b73c 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.scss
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.scss
index 6f337a27578..6f337a27578 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.scss
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');
 
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 8228e761592..d8de40e9751 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -41,13 +41,10 @@ $eventDispatcher->addListener(
 		\OCP\Util::addScript('files_sharing', 'share');
 		\OCP\Util::addScript('files_sharing', 'sharetabview');
 		\OCP\Util::addScript('files_sharing', 'sharebreadcrumbview');
-		\OCP\Util::addStyle('files_sharing', 'sharetabview');
-		\OCP\Util::addStyle('files_sharing', 'sharebreadcrumb');
+		\OCP\Util::addStyle('files_sharing', 'mergedAdditionalScripts');
 	}
 );
 
-// \OCP\Util::addStyle('files_sharing', 'sharetabview');
-
 $config = \OC::$server->getConfig();
 if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
 	\OCA\Files\App::getNavigationManager()->add(function () {
diff --git a/apps/files_sharing/css/mergedAdditionalScripts.scss b/apps/files_sharing/css/mergedAdditionalScripts.scss
new file mode 100644
index 00000000000..a95ad59967f
--- /dev/null
+++ b/apps/files_sharing/css/mergedAdditionalScripts.scss
@@ -0,0 +1,2 @@
+@import 'sharetabview.scss';
+@import 'sharebreadcrumb.scss';
diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.scss
index f24ada1898a..f24ada1898a 100644
--- a/apps/files_sharing/css/mobile.css
+++ b/apps/files_sharing/css/mobile.scss
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.scss
index 9c8c4a66630..9c8c4a66630 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.scss
diff --git a/apps/files_sharing/css/publicView.scss b/apps/files_sharing/css/publicView.scss
new file mode 100644
index 00000000000..398fd1b0a37
--- /dev/null
+++ b/apps/files_sharing/css/publicView.scss
@@ -0,0 +1,2 @@
+@import 'public.scss';
+@import 'mobile.scss';
diff --git a/apps/files_sharing/css/sharebreadcrumb.css b/apps/files_sharing/css/sharebreadcrumb.scss
index 792c8a31b7c..792c8a31b7c 100644
--- a/apps/files_sharing/css/sharebreadcrumb.css
+++ b/apps/files_sharing/css/sharebreadcrumb.scss
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.scss
index 6fd2b9b3165..6fd2b9b3165 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.scss
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 6f9d4ca032a..bf3b6c77f94 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -379,8 +379,7 @@ class ShareController extends Controller {
 
 		// Load files we need
 		\OCP\Util::addScript('files', 'file-upload');
-		\OCP\Util::addStyle('files_sharing', 'public');
-		\OCP\Util::addStyle('files_sharing', 'mobile');
+		\OCP\Util::addStyle('files_sharing', 'publicView');
 		\OCP\Util::addScript('files_sharing', 'public');
 		\OCP\Util::addScript('files', 'fileactions');
 		\OCP\Util::addScript('files', 'fileactionsmenu');
@@ -389,8 +388,7 @@ class ShareController extends Controller {
 
 		if (isset($shareTmpl['folder'])) {
 			// JS required for folders
-			\OCP\Util::addStyle('files', 'files');
-			\OCP\Util::addStyle('files', 'upload');
+			\OCP\Util::addStyle('files', 'merged');
 			\OCP\Util::addScript('files', 'filesummary');
 			\OCP\Util::addScript('files', 'breadcrumb');
 			\OCP\Util::addScript('files', 'fileinfomodel');