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/lib/Controller/ViewController.php | |
| 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/lib/Controller/ViewController.php')
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 5 |
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'); |