Merge branch 'main' into 'dev/console-error' (9db2152e) · Commits · e / infra / ecloud / nextcloud-apps / Ecloud Theme Helper

appinfo/info.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,14 +5,14 @@
		<name>/e/ Cloud Theme Helper</name>
		<summary>/e/ Theme Helper App</summary>
		<description><![CDATA[Theme Helper App]]></description>
		<version>4.0.0</version>
		<version>5.0.0</version>
		<licence>MURENA SAS</licence>
		<author mail="dev@murena.com" >MURENA SAS</author>
		<namespace>EcloudThemeHelper</namespace>
		<category>customization</category>
		<bugs>https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-theme-helper/-/issues/</bugs>
		<dependencies>
		<nextcloud min-version="27" max-version="27"/>
		<nextcloud min-version="28" max-version="28"/>
		</dependencies>
		<repair-steps>
		<install>

lib/Listeners/BeforeTemplateRenderedListener.php

+3 −0

Original line number	Diff line number	Diff line
		@@ -102,5 +102,8 @@ class BeforeTemplateRenderedListener implements IEventListener {
		if (strpos($pathInfo, '/apps/forms/') !== false) {
		$this->util->addStyle($this->appName, 'forms');
		}
		if ($pathInfo === '/settings/user/privacy') {
		$this->util->addStyle($this->appName, 'settings-privacy');
		}
		}
		}

lib/Mail/EMailTemplate.php

+11 −11

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ namespace OCA\ECloudThemeHelper\Mail;
		use OC\Mail\EMailTemplate as ParentTemplate;

		class EMailTemplate extends ParentTemplate {
		protected $header = <<<EOF
		protected string $header = <<<EOF
		<table align="center" class="container main-heading float-center" style="Margin:0 auto;background:0 0!important;border-collapse:collapse;border-spacing:0;float:none;margin-top:20px;padding:0;text-align:center;vertical-align:top;width:auto;">
		<tbody>
		<tr style="border: 1px solid #EAEDF2;box-sizing: border-box;height:70px;">
		@@ -17,7 +17,7 @@ class EMailTemplate extends ParentTemplate {
		<img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;clear:both;display:block;float:right;margin:0 auto;outline:0;text-align:center;text-decoration:none;max-height:105px;max-width:105px;width:auto;padding-top:4px;margin-left:10px;padding-right:30px">
		EOF;

		protected $heading = <<<EOF
		protected string $heading = <<<EOF
		<h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-family:arial;font-size:24px;font-weight:400;color:#000000;line-height:1.3;margin:0;padding:0;text-align:left;word-wrap:normal;padding-right:135px;padding-left:40px;">%s</h1>
		</td>
		</tr>
		@@ -27,7 +27,7 @@ EOF;
		</tr>
		EOF;

		protected $bodyBegin = <<<EOF
		protected string $bodyBegin = <<<EOF
		<tr style="border: 1px solid #EAEDF2;box-sizing: border-box;">
		<td>
		<table class="spacer float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%%">
		@@ -46,7 +46,7 @@ EOF;
		<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">
		EOF;

		protected $bannerHeading = <<<EOF
		protected string $bannerHeading = <<<EOF
		<tr style="border: 1px solid #EAEDF2;box-sizing: border-box;">
		<td>
		<table class="spacer float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%%">
		@@ -59,7 +59,7 @@ EOF;
		</td></tr>
		EOF;

		protected $buttonGrouptentative = <<<EOF
		protected string $buttonGrouptentative = <<<EOF
		<table class="spacer" style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%">
		<tbody>
		<tr style="padding:0;text-align:left;vertical-align:top">
		@@ -127,7 +127,7 @@ EOF;
		/**
		* Adds a header to the email
		*/
		public function addHeader() {
		public function addHeader(): void {
		if ($this->headerAdded) {
		return;
		}
		@@ -151,7 +151,7 @@ EOF;
		string $fontcolor,
		string $text,
		$plainText = ""
		) {
		): void {
		$this->htmlBody .= vsprintf($this->bannerHeading, [
		$bgcolor,
		$fontcolor,
		@@ -184,7 +184,7 @@ EOF;
		$plainText = "",
		$plainMetaInfo = "",
		$plainIndent = 0
		) {
		): void {
		$this->ensureBodyListOpened();

		if ($plainText === "" \|\| $plainText === true) {
		@@ -267,7 +267,7 @@ EOF;
		$plainText = "",
		$plainMetaInfo = "",
		$plainIndent = 0
		) {
		): void {
		$this->ensureBodyListOpened();

		if ($plainText === "" \|\| $plainText === true) {
		@@ -337,7 +337,7 @@ EOF;
		* @param string\|bool $plainText Text that is used in the plain text email
		* if empty the $text is used, if false none will be used
		*/
		public function addBodyText(string $text, $plainText = "") {
		public function addBodyText(string $text, $plainText = ''): void {
		if ($this->footerAdded) {
		return;
		}
		@@ -385,7 +385,7 @@ EOF;
		string $plainTextLeft = "",
		string $plainTextCenter = "",
		string $plainTextRight = ""
		) {
		): void {
		if ($this->footerAdded) {
		return;
		}

scss/calendar.scss

+37 −0

Original line number	Diff line number	Diff line
		@@ -118,3 +118,40 @@ body .property-text__input span.icon-delete {
		#content-vue #app-navigation-vue .menu-icon svg path {
		fill: var(--color-main-text);
		}

		.app-sidebar {
		.v-select {
		&.select {
		.vs__dropdown-toggle {
		border: 1px solid var(--color-border-dark);
		border-radius: var(--border-radius);
		}
		.vs__selected {
		z-index: 999;

		input {
		border: none;
		}
		}
		.vs__open-indicator-button {
		border: none;
		}
		}
		}
		}

		.vs__dropdown-menu.vs__dropdown-menu--floating {
		border: 1px solid var(--color-border-dark);
		border-radius: unset;
		box-sizing: unset;
		border-width: 1px solid var(--color-border-dark) !important;
		}
		.app-sidebar-tab__content .v-select.select.vs--open .vs__dropdown-toggle {
		border: 1px solid var(--color-border-dark);
		border-radius: unset;
		box-sizing: unset;
		border-width: 1px solid var(--color-border-dark) !important;
		}
		.app-sidebar-tab__content .avatar-participation-status__text {
		bottom:20px;
		}
		No newline at end of file

scss/files.scss

+1 −1

Original line number	Diff line number	Diff line
		#content.app-files {
		#content-vue.app-files {
		#app-content {
		margin-top: 20px;
		}