From d3592e91803db56671539566fd66ad9907950fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 20 Mar 2017 08:20:29 +0100
Subject: [PATCH 1/2] Fix popover position on firefox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/css/header.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/css/header.scss b/core/css/header.scss
index cd87a34ece8..b04d7e917e2 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));

From c994e7afcd8f9c2a6fe06a1e89a051e66cbce573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 20 Mar 2017 08:23:04 +0100
Subject: [PATCH 2/2] Fix filter for app icons on firefox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/templates/layout.user.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3cfb88bf423..1abb263edf8 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>