mirror of https://github.com/nextcloud/server
Revert "Add alt to the logo, adapt css for logo"
This reverts commit bba5ab0532
.
This commit is contained in:
parent
7ab34eefc5
commit
9af7ee8d11
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -188,9 +188,15 @@
|
|||
}
|
||||
.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));
|
||||
}
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -35,8 +35,7 @@
|
|||
<?php if ($_['bodyid'] === 'body-login'): ?>
|
||||
<header role="banner">
|
||||
<div id="header">
|
||||
|
||||
<img class="logo" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
|
||||
<div class="logo"></div>
|
||||
</div>
|
||||
</header>
|
||||
<?php endif; ?>
|
||||
|
|
|
@ -37,8 +37,15 @@
|
|||
</div>
|
||||
|
||||
<header id="header">
|
||||
<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(); ?>">
|
||||
<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>
|
||||
<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
|
||||
<div class="header-shared-by">
|
||||
<?php p($template->getHeaderDetails()); ?>
|
||||
|
|
|
@ -60,7 +60,7 @@ $getUserAvatar = static function (int $size) use ($_): string {
|
|||
<div class="header-left">
|
||||
<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
|
||||
id="nextcloud">
|
||||
<img class="logo logo-icon" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
|
||||
<div class="logo logo-icon"></div>
|
||||
</a>
|
||||
|
||||
<nav id="header-left__appmenu"></nav>
|
||||
|
|
|
@ -120,6 +120,10 @@ class TemplateLayout extends \OC_Template {
|
|||
$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);
|
||||
|
@ -190,11 +194,6 @@ class TemplateLayout extends \OC_Template {
|
|||
} 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);
|
||||
|
|
Loading…
Reference in New Issue