mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix public layout header title & description 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2020-04-30 13:31:20 +02:00
parent 5b5550dbba
commit 6e79fb60d8
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,22 +186,6 @@ thead {
text-align: left; 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 { #note-content {
padding: 5px; padding: 5px;
display:inline-block; display:inline-block;

18
core/css/header.scss
View File

@ -64,6 +64,7 @@
box-sizing: border-box; box-sizing: border-box;
opacity: 1; opacity: 1;
align-items: center; align-items: center;
display: flex;
flex-wrap: wrap; flex-wrap: wrap;
overflow: hidden; overflow: hidden;
@ -211,9 +212,9 @@
} }
#header-left, .header-left { #header-left, .header-left {
flex: 0 0; flex: 1 0;
flex-grow: 1;
white-space: nowrap; white-space: nowrap;
min-width: 0;
} }
#header-right, .header-right { #header-right, .header-right {
@ -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 */ /* only used for public share pages now as we have the app icons when logged in */
.header-appname { .header-appname {
color: var(--color-primary-text); color: var(--color-primary-text);
@ -279,6 +281,18 @@
padding-right: 5px; padding-right: 5px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; 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 */ /* do not show menu toggle on public share links as there is no menu */

8
core/templates/layout.public.php
View File

@ -39,17 +39,17 @@
<span id="nextcloud"> <span id="nextcloud">
<div class="logo logo-icon svg"></div> <div class="logo logo-icon svg"></div>
<h1 class="header-appname"> <h1 class="header-appname">
<?php if (isset($template)) { <?php if (isset($template) && $template->getHeaderTitle() !== '') {
p($template->getHeaderTitle()); p($template->getHeaderTitle());
} else { } else {
p($theme->getName()); p($theme->getName());
} ?> } ?>
</h1> </h1>
<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
<div class="header-shared-by"> <div class="header-shared-by">
<?php if (isset($template)) { <?php p($template->getHeaderDetails()); ?>
p($template->getHeaderDetails());
} ?>
</div> </div>
<?php } ?>
</span> </span>
</div> </div>