upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge pull request #20751 from nextcloud/backport/20744/stable17

Browse source 
[stable17] Fix public layout header title & description
This commit is contained in:
Roeland Jago Douma 2020-05-01 09:07:39 +02:00 committed by GitHub
commit 3cabd830eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/files_sharing/css/public.scss
View file

@ -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;

18
core/css/header.scss
View file

@ -63,6 +63,7 @@
box-sizing: border-box;
opacity: 1;
align-items: center;
display: flex;
flex-wrap: wrap;
overflow: hidden;
@ -198,9 +199,9 @@
}
#header-left, .header-left {
flex: 0 0;
flex-grow: 1;
flex: 1 0;
white-space: nowrap;
min-width: 0;
}
#header-right, .header-right {
@ -256,6 +257,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);
@ -266,6 +268,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 */

10
core/templates/layout.public.php
View file

@ -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>