diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-22 08:46:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 08:46:10 +0100 |
| commit | 16a0bccefa9d1252de61f816f96a0993857bb61b (patch) | |
| tree | 7832855ea1eb25bc6f4d04fc3e6efe7ee7ad908f /apps/files | |
| parent | c6c589647466b1e723af3a7cb0865b7186f06c45 (diff) | |
| parent | 1084cdb6135e90d48f511ee7d7141900bb769273 (diff) | |
| download | nextcloud-server-16a0bccefa9d1252de61f816f96a0993857bb61b.tar.gz nextcloud-server-16a0bccefa9d1252de61f816f96a0993857bb61b.zip | |
Merge pull request #3972 from nextcloud/merge-some-more-css
Merge some CSS files using our SCSS compiler
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | apps/files/css/detailsView.scss (renamed from apps/files/css/detailsView.css) | 0 | ||||
| -rw-r--r-- | apps/files/css/files.scss (renamed from apps/files/css/files.css) | 0 | ||||
| -rw-r--r-- | apps/files/css/merged.scss | 4 | ||||
| -rw-r--r-- | apps/files/css/mobile.scss (renamed from apps/files/css/mobile.css) | 0 | ||||
| -rw-r--r-- | apps/files/css/upload.scss (renamed from apps/files/css/upload.css) | 0 | ||||
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 5 |
7 files changed, 6 insertions, 5 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'); |