Merge branch 'dev/footer-issue' into 'main' (9ba79215) · Commits · e / infra / ecloud / nextcloud-apps / nextcloud-theme

core/css/guest.css

+32 −10

Original line number	Diff line number	Diff line
		@@ -1071,12 +1071,9 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
		/* FOOTER */
		footer {
		background-color: #ffffff;
		position: absolute;
		right: 5%;
		bottom: 0;
		padding-bottom: 15px;
		max-width: 350px;
		width: 100%;
		transition: all 0.3s linear;
		padding-bottom: 20px;
		}

		footer .info .entity-name {
		@@ -1382,7 +1379,6 @@ a.legal {
		}
		.v-align header{
		width: 100%;
		margin-top: 10vh;
		}
		.warning-messsage header{
		margin-top: 0;
		@@ -1398,12 +1394,15 @@ a.legal {
		.v-align main{
		width: 100%;
		margin: 0 auto;
		margin-bottom: 15vh;
		}
		.warning-messsage main{
		margin-bottom: 0;
		max-width: 90%;
		}
		.warning-messsage main{
		margin-bottom: 0;
		max-width: 60%;
		}
		#lost-password{
		color: #0086FF !important;
		font-family: 'Montserrat';
		@@ -1438,12 +1437,25 @@ a.legal {
		.pos-fixed{
		position: fixed !important;
		}
		#body-login > .wrapper > footer{
		display: none;
		}
		.v-align > footer{
		display: block;
		margin-top: 30px;
		}
		@media only screen and (max-width: 1440px) {
		.banner-right-align {
		width: 65%;
		}
		}
		@media only screen and (max-width: 1050px) {
		.v-align footer{
		display: none;
		}
		#body-login > .wrapper > footer{
		display: block;
		}
		.width0{
		width: 0 !important;
		height: 0 !important;
		@@ -1452,9 +1464,9 @@ a.legal {
		max-width: 80%;
		}
		#body-login .v-align{
		height: 70%;
		overflow: hidden;
		width: 70%;
		height: auto;
		}
		.banner-right-align {
		-webkit-box-ordinal-group: 2;
		@@ -1463,6 +1475,7 @@ a.legal {
		width: 100%;
		height: 60%;
		position: relative;
		clear: both;
		}
		.banner-content-create-button{
		text-align: center;
		@@ -1500,6 +1513,10 @@ a.legal {
		.banner-content-why-murena{
		margin: 5% 0 5% 0;
		}
		.warning-messsage main{
		max-width: 90%;
		overflow-x: auto;
		}
		}
		@media only screen and (max-width: 640px) {
		.wrapper{
		@@ -1527,6 +1544,9 @@ a.legal {
		#body-login .warning-messsage {
		width: 80%;
		}
		.warning-messsage main{
		max-width: 90%;
		}
		}
		@media only screen and (max-width: 375px) {
		.banner-right-align{
		@@ -1562,4 +1582,6 @@ a.legal {
		.have-an-account a{
		color: #0086ff !important;
		}

		.v-align > footer p.info {
		height: 40%;
		}

core/css/server.css

+0 −3

Original line number	Diff line number	Diff line
		@@ -1716,9 +1716,6 @@
		button#quotaincreasebutton {
		margin-top: 15px !important;
		}
		.warning-messsage footer {
		position: fixed;
		}
		@media only screen and (max-width: 640px) {
		.new-icons .color-icons {
		height: 50px;

defaults.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ class OC_Theme {
		* @return string long footer
		*/
		public function getLongFooter() {
		$footer = '<p>'.(\OC::$server->getL10N('core')->t('Copyright')).' © ' . date('Y') .' '.$this->getName() .'. '.(\OC::$server->getL10N('core')->t('All Rights Reserved')).'.</p>' ;
		$footer = '<p>'.(\OC::$server->getL10N('core')->t('Copyright')).' © ' . date('Y') .' '.$this->getName() .'.</p><p> '.(\OC::$server->getL10N('core')->t('All Rights Reserved')).'.</p>' ;
		$footer .= '<p>'.' <a href="' . $this->getTermsUrl() . '" target="_blank"> '.(\OC::$server->getL10N('core')->t('Terms & Conditions')).' </a>';
		$footer .= ' - '.' <a href="' . $this->getPrivacyUrl() . '" target="_blank"> '.(\OC::$server->getL10N('core')->t('Privacy Policy')).' </a> </p>';