Skip to content

[stable18] Fix public layout header title & description #20750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
May 1, 2020
Merged

[stable18] Fix public layout header title & description #20750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions apps/files_sharing/css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,22 +168,6 @@ thead {
text-align: left;
}

/* Needed to ellipsize long header text on share page */
#body-login #header-left,
#body-login .header-left {
overflow: hidden;
}

#header .header-shared-by {
color: var(--color-primary-text);
position: relative;
font-weight: 300;
font-size: 11px;
line-height: 11px;
overflow: hidden;
text-overflow: ellipsis;
}

#note-content {
padding: 5px;
display:inline-block;
Expand Down
18 changes: 16 additions & 2 deletions core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
box-sizing: border-box;
opacity: 1;
align-items: center;
display: flex;
flex-wrap: wrap;
overflow: hidden;

Expand Down Expand Up @@ -211,9 +212,9 @@
}

#header-left, .header-left {
flex: 0 0;
flex-grow: 1;
flex: 1 0;
white-space: nowrap;
min-width: 0;
}

#header-right, .header-right {
Expand Down Expand Up @@ -269,6 +270,7 @@
}
}

/* TODO: move into minimal css file for public shared template */
/* only used for public share pages now as we have the app icons when logged in */
.header-appname {
color: var(--color-primary-text);
Expand All @@ -279,6 +281,18 @@
padding-right: 5px;
overflow: hidden;
text-overflow: ellipsis;
// Take full width to push the header-shared-by bellow (if any)
flex: 1 1 100%;
}

.header-shared-by {
color: var(--color-primary-text);
position: relative;
font-weight: 300;
font-size: 11px;
line-height: 11px;
overflow: hidden;
text-overflow: ellipsis;
}

/* do not show menu toggle on public share links as there is no menu */
Expand Down
10 changes: 8 additions & 2 deletions core/templates/layout.public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,17 @@
<span id="nextcloud">
<div class="logo logo-icon svg"></div>
<h1 class="header-appname">
<?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName());} ?>
<?php if (isset($template) && $template->getHeaderTitle() !== '') {
p($template->getHeaderTitle());
} else {
p($theme->getName());
} ?>
</h1>
<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
<div class="header-shared-by">
<?php if (isset($template)) { p($template->getHeaderDetails()); } ?>
<?php p($template->getHeaderDetails()); ?>
</div>
<?php } ?>
</span>
</div>

Expand Down