summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJulius Härtl <github@jus.li>2016-11-23 21:52:13 +0100
committerGitHub <noreply@github.com>2016-11-23 21:52:13 +0100
commit25acce7e0d992b10b930472b8138240b7bd9af13 (patch)
treefcf6bfb25eac09fc2d1f71225e649236f4206cf4 /core
parent7d64d7ac8b0a199a709c748d0101d628b4564265 (diff)
parent51b7d0490e05cdd52cf472b6dbd3649b44826cda (diff)
downloadnextcloud-server-25acce7e0d992b10b930472b8138240b7bd9af13.tar.gz
nextcloud-server-25acce7e0d992b10b930472b8138240b7bd9af13.zip
Merge pull request #2283 from nextcloud/no-padding-if-no-settings-area
Remove padding from apps navigation if there is no settings area
Diffstat (limited to 'core')
-rw-r--r--core/css/apps.css4
-rw-r--r--core/js/apps.js4
2 files changed, 8 insertions, 0 deletions
diff --git a/core/css/apps.css b/core/css/apps.css
index bef5c7c4937..ba1e1265655 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -43,6 +43,10 @@
box-sizing: border-box;
}
+#app-navigation.without-app-settings {
+ padding-bottom: 0;
+}
+
#app-navigation .active.with-menu > a,
#app-navigation .with-counter > a {
padding-right: 50px;
diff --git a/core/js/apps.js b/core/js/apps.js
index 3b94aa1d87e..4daab5ce4c4 100644
--- a/core/js/apps.js
+++ b/core/js/apps.js
@@ -59,6 +59,10 @@
var registerAppsSlideToggle = function () {
var buttons = $('[data-apps-slide-toggle]');
+ if (buttons.length === 0) {
+ $('#app-navigation').addClass('without-app-settings');
+ }
+
$(document).click(function (event) {
if (dynamicSlideToggleEnabled) {