Skip to content

[stable29] fix: Fix truncation on public page #44989

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
susnux merged 2 commits into from
Apr 23, 2024
Merged

[stable29] fix: Fix truncation on public page #44989

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adf130e
fix: Fix truncation on public shares
Pytal Apr 23, 2024
61e8508
chore: compile assets
Pytal Apr 23, 2024
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
Next Next commit
fix: Fix truncation on public shares 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal
Pytal committed Apr 23, 2024
commit adf130ec3d1593cc26ae4b4b78407447d3eb0bc1
11 changes: 11 additions & 0 deletions core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,17 @@
flex: 1 1 100%;
}

.header-info {
display: flex;
flex-direction: column;
overflow: hidden;
}

.header-title {
overflow: hidden;
text-overflow: ellipsis;
}

.header-shared-by {
color: var(--color-primary-element-text);
position: relative;
Expand Down
24 changes: 14 additions & 10 deletions core/templates/layout.public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,21 @@
<div class="logo logo-icon"></div>
<?php endif; ?>

<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
<?php p($template->getHeaderTitle()); ?>
<?php } else { ?>
<?php p($theme->getName()); ?>
<?php } ?>
</div>
<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
<div class="header-shared-by">
<?php p($template->getHeaderDetails()); ?>
<div class="header-info">
<span class="header-title">
<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
<?php p($template->getHeaderTitle()); ?>
<?php } else { ?>
<?php p($theme->getName()); ?>
<?php } ?>
</span>
<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
<span class="header-shared-by">
<?php p($template->getHeaderDetails()); ?>
</span>
<?php } ?>
</div>
<?php } ?>
</div>
</div>

<div class="header-right">
Expand Down