summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2017-03-09 20:38:20 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2017-03-09 20:42:34 +0100
commitf2cf85fad2f25caf293126ca1058fe3e9109c75f (patch)
tree90023ddda18d0fb859789224b2e7484b4d3aef4b
parent57be594f1fa67ae02209a68330ecf711d0b2e9a2 (diff)
downloadnextcloud-server-f2cf85fad2f25caf293126ca1058fe3e9109c75f.tar.gz
nextcloud-server-f2cf85fad2f25caf293126ca1058fe3e9109c75f.zip
[PoC] combine 2 scss files!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--core/css/server.scss2
-rw-r--r--lib/private/legacy/template.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/core/css/server.scss b/core/css/server.scss
new file mode 100644
index 00000000000..04f54c82d49
--- /dev/null
+++ b/core/css/server.scss
@@ -0,0 +1,2 @@
+@import 'styles.scss';
+@import 'inputs.scss';
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index 09e3d130f49..41f481e74d9 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -117,8 +117,7 @@ class OC_Template extends \OC\Template\Base {
OC_Util::addStyle("fonts",null,true);
OC_Util::addStyle("icons",null,true);
OC_Util::addStyle("header",null,true);
- OC_Util::addStyle("inputs");
- OC_Util::addStyle("styles",null,true);
+ OC_Util::addStyle('server', null, true);
// avatars
\OC_Util::addScript('jquery.avatar', null, true);