Merge pull request #46811 from nextcloud/backport/46784/stable29

[stable29] fix(styles): Make sure footer with legal links is shown correctly
nextcloud · Jul 30, 2024 · 239ea11 · 239ea11
2 parents b827d12 + 2ce9eb3
commit 239ea11
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 26 deletions.
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
@@ -217,7 +217,7 @@ public function getShortFooter() {
 			}
 		}
 		if ($legalLinks !== '') {
-			$footer .= '<br/>' . $legalLinks;
+			$footer .= '<br/><span class="footer__legal-links">' . $legalLinks . '</span>';
 		}
 
 		return $footer;

diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
@@ -330,7 +330,7 @@ public function testGetShortFooterImprint() {
 			->method('t')
 			->willReturnArgument(0);
 
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a>', $this->template->getShortFooter());
+		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a></span>', $this->template->getShortFooter());
 	}
 
 	public function testGetShortFooterPrivacy() {
@@ -351,7 +351,7 @@ public function testGetShortFooterPrivacy() {
 			->method('t')
 			->willReturnArgument(0);
 
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter());
+		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
 	}
 
 	public function testGetShortFooterAllLegalLinks() {
@@ -372,7 +372,7 @@ public function testGetShortFooterAllLegalLinks() {
 			->method('t')
 			->willReturnArgument(0);
 
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter());
+		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
 	}
 
 	public function invalidLegalUrlProvider() {

diff --git a/core/css/public.css b/core/css/public.css
diff --git a/core/css/public.css.map b/core/css/public.css.map
diff --git a/core/css/public.scss b/core/css/public.scss
@@ -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%;
 			}
 		}
 	}