diff options
Diffstat (limited to 'lib')
| -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.'";'); |