diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-20 01:51:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 01:51:20 -0600 |
| commit | e446d223597d73c8444bb39b0acb927a1779c245 (patch) | |
| tree | 00b6d6559654970057de4f6f2e0422e880b87d58 /core | |
| parent | 81647a58db28aa332c4e6c73c99b37ca548fed2b (diff) | |
| parent | 14f465879ccff8d1d58e5a4c8514b3783086e770 (diff) | |
| download | nextcloud-server-e446d223597d73c8444bb39b0acb927a1779c245.tar.gz nextcloud-server-e446d223597d73c8444bb39b0acb927a1779c245.zip | |
Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs
Fix duplicate id "apps-management"
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index cd87a34ece8..b158f8b6660 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -324,7 +324,7 @@ nav { } /* Apps management */ -#apps-management { +.apps-management { min-height: initial; height: initial; margin: 0; diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 3cfb88bf423..dad5ee1b826 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -81,7 +81,7 @@ </a> </li> <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> - <li id="apps-management" <?php if(count($_['navigation'])>$headerIconCount-1): ?>class="hidden"<?php endif; ?>> + <li <?php if(count($_['navigation'])>$headerIconCount-1): ?> class="hidden apps-management"<?php else: ?> class="apps-management" <?php endif; ?>> <a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" /> @@ -119,7 +119,7 @@ /* show "More apps" link to app administration directly in app navigation, as last entry */ if(OC_User::isAdminUser(OC_User::getUser())): ?> - <li id="apps-management"> + <li class="apps-management"> <a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <svg width="32" height="32" viewBox="0 0 32 32" class="app-icon"> |