diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-29 16:10:53 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-07-19 08:16:57 +0200 |
| commit | 29ff7efe9a5be16b133a1ee4e43d6d2155b6a21c (patch) | |
| tree | 55f1645f13a1f5f2e0591e67dc62d23048f4a5a7 /lib/private | |
| parent | 98a0113d4083d4dff73f8212106673ccc1c4b744 (diff) | |
| download | nextcloud-server-29ff7efe9a5be16b133a1ee4e43d6d2155b6a21c.tar.gz nextcloud-server-29ff7efe9a5be16b133a1ee4e43d6d2155b6a21c.zip | |
Svg icon api sass function and upgrade of all styles
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Settings/Manager.php | 2 | ||||
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 82cb223bb9f..e9f2a6f5976 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -231,7 +231,7 @@ class Manager implements IManager { 5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))], 10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))], 45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))], - 50 => [new Section('groupware', $this->l->t('Groupware'), 0, $this->url->imagePath('core', 'places/contacts-dark.svg'))], + 50 => [new Section('groupware', $this->l->t('Groupware'), 0, $this->url->imagePath('core', 'places/contacts.svg'))], 98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))], ]; diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index d7cea03228d..0b214755afd 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -234,6 +234,7 @@ class SCSSCacher { try { $compiledScss = $scss->compile( '$webroot: \'' . \OC::$WEBROOT. '\';'. + '@import "functions.scss";' . '@import "variables.scss";' . $this->getInjectedVariables() . '@import "'.$fileNameSCSS.'";'); |