Skip to content

Commit 6583062

Browse files
ahangarhaAndyScherzinger
authored andcommitted
Update header left and right to start and end
Signed-off-by: Mostafa Ahangarha <ahangarha@riseup.net>
1 parent e45b162 commit 6583062

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

core/css/header.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
bottom: 2px;
3232
}
3333

34-
.header-right {
34+
.header-end {
3535
// Add some spacing so the last entry looks ok
3636
margin-inline-end: calc(3 * var(--default-grid-baseline));
3737

@@ -88,7 +88,7 @@
8888
/* Header menu */
8989
$header-menu-entry-height: 44px;
9090

91-
.header-right > div > .menu {
91+
.header-end > div > .menu {
9292
background-color: var(--color-main-background);
9393
filter: drop-shadow(0 1px 5px var(--color-box-shadow));
9494
border-radius: var(--border-radius-large);
@@ -146,25 +146,25 @@
146146
flex-shrink: 0;
147147
}
148148

149-
#header-left, .header-left,
150-
#header-right, .header-right {
149+
#header-start, .header-start,
150+
#header-end, .header-end {
151151
display: inline-flex;
152152
align-items: center;
153153
}
154154

155-
#header-left, .header-left {
155+
#header-start, .header-start {
156156
flex: 1 0;
157157
white-space: nowrap;
158158
min-width: 0;
159159
}
160160

161-
#header-right, .header-right {
161+
#header-end, .header-end {
162162
justify-content: flex-end;
163163
flex-shrink: 1;
164164
}
165165

166166
/* Right header standard */
167-
.header-right {
167+
.header-end {
168168
> .header-menu__trigger img {
169169
filter: var(--background-image-invert-if-bright);
170170
}

core/css/mobile.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@
132132
}
133133

134134
@media only screen and (max-width: 480px) {
135-
#header .header-right > div > .menu {
135+
#header .header-end > div > .menu {
136136
max-width: calc(100vw - 10px);
137137
position: fixed;
138138
&::after {
139139
display: none !important;
140140
}
141141
}
142142
/* Arrow directly child of menutoggle */
143-
#header .header-right > div {
143+
#header .header-end > div {
144144
&.openedMenu {
145145
&::after {
146146
display: block;

core/css/public.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
--footer-height: calc(3 * var(--default-line-height) + 3 * var(--default-grid-baseline));
1515
}
1616

17-
.header-right {
17+
.header-end {
1818

1919
#header-primary-action a {
2020
color: var(--color-primary-element-text);

core/js/public/publicpage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
window.addEventListener('DOMContentLoaded', function () {
77

8-
$('#body-public').find('.header-right .menutoggle').click(function() {
8+
$('#body-public').find('.header-end .menutoggle').click(function() {
99
$(this).next('.popovermenu').toggleClass('open');
1010
});
1111

@@ -15,7 +15,7 @@ window.addEventListener('DOMContentLoaded', function () {
1515
});
1616

1717
$(document).mouseup(function(e) {
18-
var toggle = $('#body-public').find('.header-right .menutoggle');
18+
var toggle = $('#body-public').find('.header-end .menutoggle');
1919
var container = toggle.next('.popovermenu');
2020

2121
// if the target of the click isn't the menu toggle, nor a descendant of the

core/src/components/MainMenu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const setUp = () => {
1717
},
1818
})
1919

20-
const container = document.getElementById('header-left__appmenu')
20+
const container = document.getElementById('header-start__appmenu')
2121
if (!container) {
2222
// no container, possibly we're on a public page
2323
return

core/templates/layout.public.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</div>
4343

4444
<header id="header">
45-
<div class="header-left">
45+
<div class="header-start">
4646
<div id="nextcloud" class="header-appname">
4747
<?php if ($_['logoUrl']): ?>
4848
<a href="<?php print_unescaped($_['logoUrl']); ?>"
@@ -70,7 +70,7 @@
7070
</div>
7171
</div>
7272

73-
<div class="header-right">
73+
<div class="header-end">
7474
<?php
7575
/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
7676
if (isset($template) && $template->getActionCount() !== 0) {

core/templates/layout.user.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@
6161
</div>
6262

6363
<header id="header">
64-
<div class="header-left">
64+
<div class="header-start">
6565
<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
6666
aria-label="<?php p($l->t('Go to %s', [$_['logoUrl'] ?: $_['defaultAppName']])); ?>"
6767
id="nextcloud">
6868
<div class="logo logo-icon"></div>
6969
</a>
7070

71-
<nav id="header-left__appmenu"></nav>
71+
<nav id="header-start__appmenu"></nav>
7272
</div>
7373

74-
<div class="header-right">
74+
<div class="header-end">
7575
<div id="unified-search"></div>
7676
<div id="notifications"></div>
7777
<div id="contactsmenu"></div>

0 commit comments

Comments
 (0)