upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(styles): Make sure footer with legal links is shown correctly

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2024-07-26 15:01:27 +02:00
parent 8f7033e185
commit 75efbfda94
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
3 changed files with 42 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/theming/lib/ThemingDefaults.php
View file

@ -217,7 +217,7 @@ class ThemingDefaults extends \OC_Defaults {
}
}
if ($legalLinks !== '') {
$footer .= '<br/>' . $legalLinks;
$footer .= '<br/><span class="footer__legal-links">' . $legalLinks . '</span>';
}
return $footer;

57
core/css/public.scss
View file

@ -1,6 +1,15 @@
$footer-height: 65px;
#body-public {
--footer-height: calc(var(--default-line-height) + 2 * var(--default-grid-baseline));;
&:has(.footer__legal-links),
&:has(.footer__simple-sign-up) {
--footer-height: calc(2 * var(--default-line-height) + 3 * var(--default-grid-baseline));;
}
&:has(.footer__legal-links):has(.footer__simple-sign-up) {
--footer-height: calc(3 * var(--default-line-height) + 3 * var(--default-grid-baseline));
}
.header-right {
#header-primary-action a {
@ -37,9 +46,11 @@ $footer-height: 65px;
}
#content {
// 100% - footer
min-height: calc(100% - #{$footer-height});
min-height: var(--body-height, calc(100% - var(--footer-height)));
}
#app-content-vue {
padding-block-end: var(--footer-height);
}
/** don't apply content header padding on the base layout */
@ -64,27 +75,39 @@ $footer-height: 65px;
/* public footer */
footer {
position: fixed;
bottom: var(--body-container-margin);;
background-color: var(--color-main-background);
border-radius: var(--body-container-radius);
box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: $footer-height;
flex-direction: column;
bottom: 0;
width: calc(100% - 16px);
margin: 8px;
background-color: var(--color-main-background);
border-radius: var(--border-radius-large);
height: var(--footer-height);
width: calc(100% - 2 * var(--body-container-margin));
margin-inline: var(--body-container-margin);
padding-block: var(--default-grid-baseline);
.footer__legal-links {
margin-block-end: var(--default-grid-baseline);
}
p {
text-align: center;
color: var(--color-text-lighter);
color: var(--color-text-maxcontrast);
margin-block: 0 var(--default-grid-baseline);
width: 100%;
a {
color: var(--color-text-lighter);
display: inline-block;
font-size: var(--default-font-size);
font-weight: bold;
line-height: var(--default-line-height);
height: var(--default-line-height);
color: var(--color-text-maxcontrast);
white-space: nowrap;
/* increasing clickability to more than the text height */
padding: 10px;
margin: -10px;
line-height: 200%;
}
}
}

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

@ -113,7 +113,7 @@ if (isset($template) && $template->getActionCount() !== 0) {
<?php
if ($_['showSimpleSignUpLink']) {
?>
<p>
<p class="footer__simple-sign-up">
<a href="<?php p($_['signUpLink']); ?>" target="_blank" rel="noreferrer noopener">
<?php p($l->t('Get your own free account')); ?>
</a>