Add alt to the logo, adapt css for logo

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
nextcloud · Nov 14, 2022 · 204bcc3 · 204bcc3
1 parent dce8345
commit 204bcc3
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 49 deletions.
diff --git a/core/css/guest.css b/core/css/guest.css
@@ -76,12 +76,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
diff --git 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;
 	}
 
 	.header-appname-container {

diff --git a/core/css/server.css b/core/css/server.css
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
@@ -34,12 +34,11 @@
 			<div class="v-align">
 				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
+						<h1 class="hidden-visually">
+							<?php p($theme->getName()); ?>
+						</h1>
 						<div id="header">
-							<div class="logo">
-								<h1 class="hidden-visually">
-									<?php p($theme->getName()); ?>
-								</h1>
-							</div>
+							<img class="logo" alt="<?= 'Logo'.' '.$theme->getName() ?>" src="<?= $_['logoUrl'].$theme->getLogo(); ?>">
 						</div>
 					</header>
 				<?php endif; ?>

diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
@@ -37,22 +37,20 @@
 	</div>
 
 	<header id="header">
-		<div class="header-left">
-			<span id="nextcloud">
-				<div class="logo logo-icon svg"></div>
-				<h1 class="header-appname">
-					<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
-						<?php p($template->getHeaderTitle()); ?>
-					<?php } else { ?>
-						<?php	p($theme->getName()); ?>
-					<?php } ?>
-				</h1>
-				<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
-				<div class="header-shared-by">
-					<?php p($template->getHeaderDetails()); ?>
-				</div>
+		<div class="header-left" id="nextcloud">
+			<img class="logo logo-icon svg" alt="<?= p($l->t('Logo')).' '.$theme->getName() ?>" src="<?= $_['logoUrl'].$theme->getLogo(); ?>">
+			<h1 class="header-appname">
+				<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
+					<?php p($template->getHeaderTitle()); ?>
+				<?php } else { ?>
+					<?php	p($theme->getName()); ?>
 				<?php } ?>
-			</span>
+			</h1>
+			<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
+			<div class="header-shared-by">
+				<?php p($template->getHeaderDetails()); ?>
+			</div>
+			<?php } ?>
 		</div>
 
 		<div class="header-right">

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
@@ -57,14 +57,13 @@
 		</div>
 
 		<header role="banner" id="header">
+			<h1 class="hidden-visually">
+				<?php p($l->t('%s\'s homepage', [$theme->getName()])); ?>
+			</h1>
 			<div class="header-left">
 				<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
 					id="nextcloud">
-					<div class="logo logo-icon">
-						<h1 class="hidden-visually">
-							<?php p($l->t('%s\'s homepage', [$theme->getName()])); ?>
-						</h1>
-					</div>
+					<img class="logo logo-icon" alt="<?= p($l->t('Logo')).' '.$theme->getName() ?>" src="<?= $_['logoUrl'].$theme->getLogo(); ?>">
 				</a>
 
 				<nav id="header-left__appmenu"></nav>