Merge pull request #3972 from nextcloud/merge-some-more-css

Merge some CSS files using our SCSS compiler

8 files changed, 7 insertions, 8 deletions

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 8228e761592..fdaf3d1ec6c 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', 'mergedAdditionalStyles');
 	}
 );
 
-// \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/mergedAdditionalStyles.scss b/apps/files_sharing/css/mergedAdditionalStyles.scss
new file mode 100644
index 00000000000..a95ad59967f
--- /dev/null
+++ b/apps/files_sharing/css/mergedAdditionalStyles.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');