diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-20 13:15:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 13:15:43 +0100 |
| commit | 29039eb608e03c9e2e28082de05812fd948e1441 (patch) | |
| tree | 4752ab9077e0483d549b9e3373303f3596670f59 /core | |
| parent | 376e6f0884b576e2be466c8387dfad4a3ce6d967 (diff) | |
| parent | c994e7afcd8f9c2a6fe06a1e89a051e66cbce573 (diff) | |
| download | nextcloud-server-29039eb608e03c9e2e28082de05812fd948e1441.tar.gz nextcloud-server-29039eb608e03c9e2e28082de05812fd948e1441.zip | |
Merge pull request #3951 from nextcloud/menu-firefox-fixes
Fix new app menu on firefox
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index b158f8b6660..fd2da104c38 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -33,7 +33,6 @@ width: 0; position: absolute; pointer-events: none; - margin-left: -10px; } } @@ -479,6 +478,7 @@ nav { vertical-align: top !important; position: relative; height: 44px; + display: inline-block; } } @@ -511,7 +511,7 @@ nav { color: rgba(0, 0, 0, .6); width: auto; left: 50%; - top: 31px; + top: 32px; transform: translateX(-50%); padding: 4px 10px; -webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, .75)); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dad5ee1b826..adeeaf03797 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -105,8 +105,8 @@ <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> <svg width="32" height="32" viewBox="0 0 32 32"> - <defs><filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> - <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> + <defs><filter id="invert-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> + <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> </svg> <div class="icon-loading-dark" style="display:none;"></div> <span> @@ -123,8 +123,8 @@ <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"> - <defs><filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> - <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>"></image> + <defs><filter id="invert-appsmanagement"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> + <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-appsmanagement)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>"></image> </svg> <div class="icon-loading-dark" style="display:none;"></div> <span> |