From 15bad0c1ca2bab1a71574f1b0b3bfd5b707a5fb0 Mon Sep 17 00:00:00 2001
From: "julia.kirschenheuter" <julia.kirschenheuter@nextcloud.com>
Date: Thu, 10 Nov 2022 09:10:48 +0100
Subject: [PATCH] Add alt to the logo, adapt css for logo

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
---
 core/css/guest.css               |  9 +++------
 core/css/header.css              |  6 ------
 core/css/header.css.map          |  2 +-
 core/css/header.scss             |  6 ------
 core/css/server.css              |  6 ------
 core/templates/layout.guest.php  |  3 ++-
 core/templates/layout.public.php | 11 ++---------
 core/templates/layout.user.php   |  2 +-
 lib/private/TemplateLayout.php   |  9 +++++----
 9 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/core/css/guest.css b/core/css/guest.css
index 26a82b4d53d30..bfd13ef98b9c1 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -82,12 +82,9 @@ body {
 }
 
 #header .logo {
-	background-image: var(--image-logo, url('../../core/img/logo/logo.svg'));
-	background-repeat: no-repeat;
-	background-size: contain;
-	background-position: center;
-	width: 175px;
-	height: 130px;
+	max-width: 175px;
+	width: auto;
+	max-height: 130px;
 	margin: 0 auto;
 	position: relative;
 	left: unset;
diff --git a/core/css/header.css b/core/css/header.css
index eb48529c60810..8824a48f86385 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -173,15 +173,9 @@
 }
 #header .logo {
   display: inline-flex;
-  background-image: var(--image-logoheader, var(--image-logo, url("../img/logo/logo.svg")));
-  background-repeat: no-repeat;
-  background-size: contain;
-  background-position: center;
   width: 62px;
   position: absolute;
   left: 12px;
-  top: 1px;
-  bottom: 1px;
   filter: var(--image-logoheader-custom, var(--background-image-invert-if-bright));
 }
 #header .header-appname-container {
diff --git a/core/css/header.css.map b/core/css/header.css.map
index d5d1a2abdb289..8991f42478af3 100644
--- a/core/css/header.css.map
+++ b/core/css/header.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["variables.scss","header.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAgBA;AACA;AAAA;EAEC;EACA;EACA;;AACA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;EACA,QDoEe;ECnEf;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AASF;AACC;AAqIA;;AAlIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAfD;EACA;EAgBC;EACA,KDyBc;ECxBd;EACA;AAMA;AAmBA;;AAvBA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EAEC;EAzCF;EACA;;AA6CC;EACC;EACA;EACA;EACA;;AAEC;EACC;EACA;EACA;EACA,QAlDuB;EAmDvB;EACA;EACA;EACA;EACA;EACA;;AACA;EAEC;;AAED;EAEC;;AAED;EACC;EACA;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAED;EACC;EACA;;AAED;AAAA;EAEC;EACA;EACA;EACA;EACA;;AAML;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;;AAGD;EACC;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAKA;AAAA;EAEC;EACA;;AACA;AAAA;EACC;EACA;EACA;EACA,ODzGY;EC0GZ;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOL;AAEA;EACC;;;AAGD;AACA;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;AAEA;;AACA;EACC;AAAY;EACZ;AAqBA;AA2BA;;AA9CA;EAGC;;AAEA;AAAA;AAAA;AAAA;EAEC;EACA;EACA;;AAED;EACC;;AAED;EACC;;AAKF;EACC;EACA;EACA;AAMA;;AAJA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;AAEA;;AACA;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIF;EACC;;;AAIF;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC,KDtPc;;;AC2PhB;AAGC;AAAA;EACC;EACA;;AAED;AAAA;AAAA;AAAA;EAEC;EACA;EACA","file":"header.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["variables.scss","header.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAgBA;AACA;AAAA;EAEC;EACA;EACA;;AACA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;EACA,QDoEe;ECnEf;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AASF;AACC;AA+HA;;AA5HA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAfD;EACA;EAgBC;EACA,KDyBc;ECxBd;EACA;AAMA;AAmBA;;AAvBA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EAEC;EAzCF;EACA;;AA6CC;EACC;EACA;EACA;EACA;;AAEC;EACC;EACA;EACA;EACA,QAlDuB;EAmDvB;EACA;EACA;EACA;EACA;EACA;;AACA;EAEC;;AAED;EAEC;;AAED;EACC;EACA;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAED;EACC;EACA;;AAED;AAAA;EAEC;EACA;EACA;EACA;EACA;;AAML;EACC;EACA;EACA;EACA;EAEA;;AAGD;EACC;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAKA;AAAA;EAEC;EACA;;AACA;AAAA;EACC;EACA;EACA;EACA,ODnGY;ECoGZ;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOL;AAEA;EACC;;;AAGD;AACA;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;AAEA;;AACA;EACC;AAAY;EACZ;AAqBA;AA2BA;;AA9CA;EAGC;;AAEA;AAAA;AAAA;AAAA;EAEC;EACA;EACA;;AAED;EACC;;AAED;EACC;;AAKF;EACC;EACA;EACA;AAMA;;AAJA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;AAEA;;AACA;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIF;EACC;;;AAIF;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC,KDhPc;;;ACqPhB;AAGC;AAAA;EACC;EACA;;AAED;AAAA;AAAA;AAAA;EAEC;EACA;EACA","file":"header.css"}
\ No newline at end of file
diff --git a/core/css/header.scss b/core/css/header.scss
index c363312ab8bdb..8691d464bd027 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -163,15 +163,9 @@
 	}
 	.logo {
 		display: inline-flex;
-		background-image: var(--image-logoheader, var(--image-logo, url('../img/logo/logo.svg')));
-		background-repeat: no-repeat;
-		background-size: contain;
-		background-position: center;
 		width: 62px;
 		position: absolute;
 		left: 12px;
-		top: 1px;
-		bottom: 1px;
 		// Invert if not customized and background is bright
 		filter: var(--image-logoheader-custom, var(--background-image-invert-if-bright));
 	}
diff --git a/core/css/server.css b/core/css/server.css
index 0719ee5f41532..f92326578c34e 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -2193,15 +2193,9 @@ label.infield {
 }
 #header .logo {
   display: inline-flex;
-  background-image: var(--image-logoheader, var(--image-logo, url("../img/logo/logo.svg")));
-  background-repeat: no-repeat;
-  background-size: contain;
-  background-position: center;
   width: 62px;
   position: absolute;
   left: 12px;
-  top: 1px;
-  bottom: 1px;
   filter: var(--image-logoheader-custom, var(--background-image-invert-if-bright));
 }
 #header .header-appname-container {
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index b32d163cd693a..5e132985243c2 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,7 +35,8 @@
 				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
 						<div id="header">
-							<div class="logo"></div>
+
+							<img class="logo" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
 						</div>
 					</header>
 				<?php endif; ?>
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index 65110fb84f505..1533419e92db9 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -37,15 +37,8 @@
 	</div>
 
 	<header id="header">
-		<div class="header-left">
-			<div class="logo logo-icon svg"></div>
-			<span id="nextcloud" class="header-appname">
-				<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
-					<?php p($template->getHeaderTitle()); ?>
-				<?php } else { ?>
-					<?php	p($theme->getName()); ?>
-				<?php } ?>
-			</span>
+		<div class="header-left" id="nextcloud">
+			<img class="logo logo-icon svg" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
 			<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
 				<div class="header-shared-by">
 					<?php p($template->getHeaderDetails()); ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 10d8c9bad97ad..ce8988af9b6c6 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -60,7 +60,7 @@
 			<div class="header-left">
 				<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
 					id="nextcloud">
-					<div class="logo logo-icon"></div>
+					<img class="logo logo-icon" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
 				</a>
 
 				<nav id="header-left__appmenu"></nav>
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index e043f79745ac0..3e2e004cb9775 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -114,10 +114,6 @@ public function __construct($renderAs, $appId = '') {
 				$this->assign('enabledThemes', $themesService->getEnabledThemes());
 			}
 
-			// set logo link target
-			$logoUrl = $this->config->getSystemValueString('logo_url', '');
-			$this->assign('logoUrl', $logoUrl);
-
 			// Add navigation entry
 			$this->assign('application', '');
 			$this->assign('appid', $appId);
@@ -188,6 +184,11 @@ public function __construct($renderAs, $appId = '') {
 		} else {
 			parent::__construct('core', 'layout.base');
 		}
+
+		// set logo link target
+		$logoUrl = $this->config->getSystemValueString('logo_url', '');
+		$this->assign('logoUrl', $logoUrl);
+
 		// Send the language and the locale to our layouts
 		$lang = \OC::$server->getL10NFactory()->findLanguage();
 		$locale = \OC::$server->getL10NFactory()->findLocale($lang);