diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-03-26 15:48:19 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-26 15:48:19 -0600 |
commit | 12c5c336ad8fdc5d47cb663f0c3c43744dfe5309 (patch) | |
tree | a5286ba7186d02b619cc7b4d9e5d58b145227130 /settings | |
parent | 96d4e1cab5ebf030832bbd052d8f4705b9b726d2 (diff) | |
parent | 8d3c461151ad9515772609059063f5bdf5a32bf3 (diff) | |
download | nextcloud-server-12c5c336ad8fdc5d47cb663f0c3c43744dfe5309.tar.gz nextcloud-server-12c5c336ad8fdc5d47cb663f0c3c43744dfe5309.zip |
Merge pull request #4077 from nextcloud/better-navigation-management
Register the app management in the normal way
Diffstat (limited to 'settings')
-rw-r--r-- | settings/img/apps.svg | 5 | ||||
-rw-r--r-- | settings/js/apps.js | 8 |
2 files changed, 6 insertions, 7 deletions
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..215b3c2c92e 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -530,21 +530,17 @@ OC.Settings.Apps = OC.Settings.Apps || { } previousEntry = entry; // do not show apps from #appmenu in #navigation - if(i < 7) { + if(i <= 7) { $('#navigation li').eq(i).addClass('in-header'); } else { $('#navigation li').eq(i).removeClass('in-header'); } } - - - if (navEntries.length > 7) { + if (navEntries.length > 8) { $('#more-apps').show(); - $('.apps-management').hide(); } else { $('#more-apps').hide(); - $('.apps-management').show(); } } }); |