diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-21 18:42:06 +0300 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2017-03-21 18:42:06 +0300 |
| commit | 5a82ac187d20d839e385784b7c833d0c22d6b6b6 (patch) | |
| tree | 10028170ce301bb141b98e16783b9ff031af48ef | |
| parent | 73ad6f636232893a8593f95b81a8ae24e2475bb1 (diff) | |
Use SCSS compiler to save requests
Shaves off 3 CSS requests on page loads.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| -rw-r--r-- | appinfo/app.php | 10 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | css/DroidSansMono/stylesheet.scss (renamed from css/DroidSansMono/stylesheet.css) | 0 | ||||
| -rw-r--r-- | css/merged.scss | 3 | ||||
| -rw-r--r-- | css/mobile.scss (renamed from css/mobile.css) | 0 | ||||
| -rw-r--r-- | css/style.scss (renamed from css/style.css) | 0 |
6 files changed, 8 insertions, 7 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index d235eda..4c209cb 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -4,12 +4,10 @@ if (\OCP\User::isLoggedIn()) { $eventDispatcher = \OC::$server->getEventDispatcher(); $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', function() { - OCP\Util::addStyle('files_texteditor', 'DroidSansMono/stylesheet'); - OCP\Util::addStyle('files_texteditor', 'style'); - OCP\Util::addStyle('files_texteditor', 'mobile'); - OCP\Util::addscript('files_texteditor', 'editor'); - OCP\Util::addscript('files_texteditor', 'sidebarpreview'); - OCP\Util::addscript('files_texteditor', 'core/vendor/ace-builds/src-noconflict/ace'); + OCP\Util::addStyle('files_texteditor', 'merged'); + OCP\Util::addScript('files_texteditor', 'editor'); + OCP\Util::addScript('files_texteditor', 'sidebarpreview'); + OCP\Util::addScript('files_texteditor', 'core/vendor/ace-builds/src-noconflict/ace'); $cspManager = \OC::$server->getContentSecurityPolicyManager(); $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy(); diff --git a/appinfo/info.xml b/appinfo/info.xml index 6d6e32e..e9b5c8f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -7,7 +7,7 @@ More information is available in the text editor documentation. </description> <licence>AGPL</licence> <author>Tom Needham, Björn Schießle</author> - <version>2.3</version> + <version>2.4</version> <shipped>true</shipped> <default_enable/> <ocsid>166051</ocsid> diff --git a/css/DroidSansMono/stylesheet.css b/css/DroidSansMono/stylesheet.scss index c758c2c..c758c2c 100644 --- a/css/DroidSansMono/stylesheet.css +++ b/css/DroidSansMono/stylesheet.scss diff --git a/css/merged.scss b/css/merged.scss new file mode 100644 index 0000000..dd80466 --- /dev/null +++ b/css/merged.scss @@ -0,0 +1,3 @@ +@import 'DroidSansMono/stylesheet.scss'; +@import 'style.scss'; +@import 'mobile.scss'; diff --git a/css/mobile.css b/css/mobile.scss index 081c58c..081c58c 100644 --- a/css/mobile.css +++ b/css/mobile.scss diff --git a/css/style.css b/css/style.scss index 1e01385..1e01385 100644 --- a/css/style.css +++ b/css/style.scss |