Use flexbox for header and rearrange some elements
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst
parent
16afaa783b
commit
202509251c
3 changed files with 77 additions and 65 deletions
|
|
@ -38,6 +38,7 @@
|
|||
#body-user #header,
|
||||
#body-settings #header,
|
||||
#body-public #header {
|
||||
display: inline-flex;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
|
@ -47,13 +48,11 @@
|
|||
line-height: 2.5em;
|
||||
background-color: #0082c9;
|
||||
box-sizing: border-box;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
/* LOGO and APP NAME -------------------------------------------------------- */
|
||||
#nextcloud {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
padding: 5px;
|
||||
padding-bottom: 0;
|
||||
height: 45px;
|
||||
|
|
@ -92,8 +91,6 @@
|
|||
}
|
||||
.header-appname-container {
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
left: 70px;
|
||||
height: 27px;
|
||||
padding-top: 18px;
|
||||
padding-right: 10px;
|
||||
|
|
@ -108,6 +105,19 @@
|
|||
padding: 0;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#header-left #header-right {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
div.header-left {
|
||||
flex: 0 0 50%;
|
||||
}
|
||||
|
||||
#header-right {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
}
|
||||
|
||||
/* hover effect for app switcher label */
|
||||
|
|
@ -306,7 +316,7 @@
|
|||
}
|
||||
|
||||
#settings {
|
||||
float: right;
|
||||
display: inline-block;
|
||||
color: #ddd;
|
||||
cursor: pointer;
|
||||
.icon-loading-small-dark {
|
||||
|
|
@ -315,6 +325,7 @@
|
|||
margin-right: 6px;
|
||||
background-size: 16px 16px;
|
||||
}
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
/* User menu on the right */
|
||||
|
|
|
|||
|
|
@ -169,7 +169,6 @@ body {
|
|||
border: 0;
|
||||
border-radius: 3px;
|
||||
margin-top: 9px;
|
||||
float: right;
|
||||
width: 0;
|
||||
cursor: pointer;
|
||||
-webkit-transition: all 100ms;
|
||||
|
|
@ -179,7 +178,6 @@ body {
|
|||
&:focus, &:active, &:valid {
|
||||
color: #fff;
|
||||
width: 155px;
|
||||
max-width: 50%;
|
||||
cursor: text;
|
||||
background-color: #0082c9;
|
||||
border: 1px solid rgba(255, 255, 255, 0.5);
|
||||
|
|
|
|||
|
|
@ -42,67 +42,70 @@
|
|||
<div id="notification"></div>
|
||||
</div>
|
||||
<header role="banner"><div id="header">
|
||||
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
|
||||
id="nextcloud" tabindex="1">
|
||||
<div class="logo-icon">
|
||||
<h1 class="hidden-visually">
|
||||
<?php p($theme->getName()); ?>
|
||||
</h1>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<a href="#" class="header-appname-container menutoggle" tabindex="2">
|
||||
<h1 class="header-appname">
|
||||
<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
|
||||
</h1>
|
||||
<div class="icon-caret"></div>
|
||||
</a>
|
||||
|
||||
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
|
||||
<div id="settings">
|
||||
<div id="expand" tabindex="6" role="link" class="menutoggle">
|
||||
<?php if ($_['enableAvatars']): ?>
|
||||
<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
|
||||
<?php if ($_['userAvatarSet']): ?>
|
||||
<img alt="" width="32" height="32"
|
||||
src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
|
||||
srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
|
||||
>
|
||||
<?php endif; ?>
|
||||
<div class="header-left">
|
||||
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
|
||||
id="nextcloud" tabindex="1">
|
||||
<div class="logo-icon">
|
||||
<h1 class="hidden-visually">
|
||||
<?php p($theme->getName()); ?>
|
||||
</h1>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
|
||||
</a>
|
||||
|
||||
<a href="#" class="header-appname-container menutoggle" tabindex="2">
|
||||
<h1 class="header-appname">
|
||||
<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
|
||||
</h1>
|
||||
<div class="icon-caret"></div>
|
||||
</div>
|
||||
<div id="expanddiv">
|
||||
<ul>
|
||||
<?php foreach($_['settingsnavigation'] as $entry):?>
|
||||
<li>
|
||||
<a href="<?php print_unescaped($entry['href']); ?>"
|
||||
<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
|
||||
<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
|
||||
<?php p($entry['name']) ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
<li>
|
||||
<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
|
||||
<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>">
|
||||
<?php p($l->t('Log out'));?>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<form class="searchbox" action="#" method="post" role="search" novalidate>
|
||||
<label for="searchbox" class="hidden-visually">
|
||||
<?php p($l->t('Search'));?>
|
||||
</label>
|
||||
<input id="searchbox" type="search" name="query"
|
||||
value="" required
|
||||
autocomplete="off" tabindex="5">
|
||||
</form>
|
||||
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
|
||||
<div id="header-right">
|
||||
<form class="searchbox" action="#" method="post" role="search" novalidate>
|
||||
<label for="searchbox" class="hidden-visually">
|
||||
<?php p($l->t('Search'));?>
|
||||
</label>
|
||||
<input id="searchbox" type="search" name="query"
|
||||
value="" required
|
||||
autocomplete="off" tabindex="5">
|
||||
</form>
|
||||
<div id="settings">
|
||||
<div id="expand" tabindex="6" role="link" class="menutoggle">
|
||||
<?php if ($_['enableAvatars']): ?>
|
||||
<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
|
||||
<?php if ($_['userAvatarSet']): ?>
|
||||
<img alt="" width="32" height="32"
|
||||
src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
|
||||
srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
|
||||
>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
|
||||
<div class="icon-caret"></div>
|
||||
</div>
|
||||
<div id="expanddiv">
|
||||
<ul>
|
||||
<?php foreach($_['settingsnavigation'] as $entry):?>
|
||||
<li>
|
||||
<a href="<?php print_unescaped($entry['href']); ?>"
|
||||
<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
|
||||
<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
|
||||
<?php p($entry['name']) ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
<li>
|
||||
<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
|
||||
<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>">
|
||||
<?php p($l->t('Log out'));?>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div></header>
|
||||
|
||||
<nav role="navigation"><div id="navigation">
|
||||
|
|
|
|||
Loading…
Reference in a new issue