diff options
| -rw-r--r-- | core/css/header.scss | 24 | ||||
| -rw-r--r-- | lib/private/NavigationManager.php | 7 | ||||
| -rw-r--r-- | settings/img/apps.svg | 5 | ||||
| -rw-r--r-- | settings/js/apps.js | 6 |
4 files changed, 9 insertions, 33 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 4b6c0fbd007..1ba90aaabff 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -322,28 +322,6 @@ nav { } /* Apps management */ -.apps-management { - min-height: initial; - height: initial; - margin: 0; - a { - svg, - span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)'; - opacity: .3; - } - /* icon opacity and hover effect */ - &:hover svg, - &:focus svg, - &.active svg, - &:hover span, - &:focus span, - &.active span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; - opacity: 1; - } - } -} #apps { max-height: calc(100vh - 100px); @@ -583,4 +561,4 @@ nav { } } -}
\ No newline at end of file +} diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php index 439b4795246..0b1f43d7de9 100644 --- a/lib/private/NavigationManager.php +++ b/lib/private/NavigationManager.php @@ -163,8 +163,8 @@ class NavigationManager implements INavigationManager { } $this->init = true; + $l = $this->l10nFac->get('lib'); if ($this->config->getSystemValue('knowledgebaseenabled', true)) { - $l = $this->l10nFac->get('lib'); $this->add([ 'type' => 'settings', 'id' => 'help', @@ -177,18 +177,17 @@ class NavigationManager implements INavigationManager { if ($this->userSession->isLoggedIn()) { if ($this->isAdmin()) { - $l = $this->l10nFac->get('settings'); // App management $this->add([ + 'type' => 'settings', 'id' => 'core_apps', - 'order' => 9999, + 'order' => 50, 'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'), 'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'), 'name' => $l->t('Apps'), ]); } - $l = $this->l10nFac->get('lib'); // Personal settings $this->add([ 'type' => 'settings', diff --git a/settings/img/apps.svg b/settings/img/apps.svg index d1509ea3a37..b6e545799a3 100644 --- a/settings/img/apps.svg +++ b/settings/img/apps.svg @@ -1 +1,4 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1"><path d="M14 6v8H6v4h8v8h4v-8h8v-4h-8V6h-4z" fill="#FFF"/></svg>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"> + <path d="m7 2v5h-5v2h5v5h2v-5h5v-2h-5v-5z"/> +</svg> diff --git a/settings/js/apps.js b/settings/js/apps.js index d2f26578a7c..253cc7b1eaf 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -537,14 +537,10 @@ OC.Settings.Apps = OC.Settings.Apps || { } } - - - if (navEntries.length > 7) { + if (navEntries.length > 8) { $('#more-apps').show(); - $('.apps-management').hide(); } else { $('#more-apps').hide(); - $('.apps-management').show(); } } }); |
