Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84ce6fb5 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/nc-25-regressions' into 'main' 

nc-25- regressions

See merge request e/infra/ecloud/nextcloud-apps/ecloud-theme-helper!63
parents 36f0bc9b bec9c764

css/icons.css

+6 −0
Original line number Diff line number Diff line 
/* stylelint-disable indentation */

:root {

    --icon-download-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld2JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik02IDFoNHY3aDVsLTcgNy03LTdoNXoiIGZpbGw9IiMwMDAiLz48L3N2Zz4K);

    --icon-download-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld2JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik02IDFoNHY3aDVsLTcgNy03LTdoNXoiIGZpbGw9IiNmZmYiLz48L3N2Zz4K);

    --icon-confirm-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdib3g9IjAgMCAxNiAxNiIgd2lkdGg9IjE2IiB2ZXJzaW9uPSIxLjEiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Im04LjUgMC41Yy0wLjg5NzQgMC0xLjM0MDQgMS4wOTA5LTAuNjk3MyAxLjcxNjhsNC43ODM3IDQuNzgzMmgtMTEuNTczYy0xLjM1MjMtMC4wMTkxMjUtMS4zNTIzIDIuMDE5MSAwIDJoMTEuNTcybC00Ljc4MzIgNC43ODMyYy0wLjk4MTYzIDAuOTQyNTEgMC40NzE1NSAyLjM5NTcgMS40MTQxIDEuNDE0MWw2LjQ5MTEtNi40OWMwLjM4Ny0wLjM4NzggMC4zOTEtMS4wMjI4IDAtMS40MTRsLTYuNDkwNi02LjQ5MDNjLTAuMTg4My0wLjE5MzUtMC40NDY4LTAuMzAyNjgtMC43MTY4LTAuMzAyN3oiIGZpbGw9IiNmZmYiLz48L3N2Zz4K);

    --icon-more-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTIuNSA2LjI1YTEuNzUgMS43NSAwIDEgMSAwIDMuNSAxLjc1IDEuNzUgMCAwIDEgMC0zLjV6bTUuNSAwYTEuNzUgMS43NSAwIDEgMSAwIDMuNSAxLjc1IDEuNzUgMCAwIDEgMC0zLjV6bTUuNSAwYTEuNzUgMS43NSAwIDEgMSAwIDMuNSAxLjc1IDEuNzUgMCAxIDEgMC0zLjV6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);

    --icon-search-000: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0IiB2aWV3Qm94PSIwIDAgMTQgMTQiIGZpbGw9Im5vbmUiIHZlcnNpb249IjEuMSIgaWQ9InN2ZzQiIHNvZGlwb2RpOmRvY25hbWU9InNlYXJjaC5zdmciIGlua3NjYXBlOnZlcnNpb249IjEuMSAoYzY4ZTIyYzM4NywgMjAyMS0wNS0yMykiCiAgICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgIHhtbG5zOnNvZGlwb2RpPSJodHRwOi8vc29kaXBvZGkuc291cmNlZm9yZ2UubmV0L0RURC9zb2RpcG9kaS0wLmR0ZCIKICAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogICAgPGRlZnMgaWQ9ImRlZnM4IiAvPgogICAgPHNvZGlwb2RpOm5hbWVkdmlldyBpZD0ibmFtZWR2aWV3NiIgcGFnZWNvbG9yPSIjNTA1MDUwIiBib3JkZXJjb2xvcj0iI2ZmZmZmZiIgYm9yZGVyb3BhY2l0eT0iMSIgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMCIgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiIGlua3NjYXBlOnBhZ2VjaGVja2VyYm9hcmQ9IjEiIHNob3dncmlkPSJmYWxzZSIgaW5rc2NhcGU6em9vbT0iNDYuNCIgaW5rc2NhcGU6Y3g9IjcuMDA0MzEwMyIgaW5rc2NhcGU6Y3k9IjcuNDg5MjI0MSIgaW5rc2NhcGU6d2luZG93LXdpZHRoPSIxOTIwIiBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSIxMDE3IiBpbmtzY2FwZTp3aW5kb3cteD0iLTgiIGlua3NjYXBlOndpbmRvdy15PSItOCIgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMSIgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnNCIgLz4KICAgIDxwYXRoIGQ9Ik0gMTIuOTAwNzc5LDExLjk3NjQ0NCAxMC4wNjkwMzYsOS4xNDQ3MzY3IEMgOS45OTgxMjQxLDkuMDk4NDQwNyA5LjkyODY2ODksOS4wNTA2MTk5IDkuODU4MzkzNyw5LjA1MDYxOTkgSCA5LjU1NDEyODEgQyAxMC4yNzk3Nyw4LjIwODEzMzUgMTAuNzQ3NjYxLDcuMDg0NzAyNyAxMC43NDc2NjEsNS44Njc3MDI5IGMgMCwtMi42Njc5MTc0IC0yLjE5OTgyNjgsLTQuODY3NzAzMDMgLTQuODY3ODgxMywtNC44Njc3MDMwMyAtMi42OTEzNDg1LDAgLTQuODY3Njk4NSwyLjE5OTc4NTYzIC00Ljg2NzY5ODUsNC44Njc3MDMwMyAwLDIuNjkxMzM5NCAyLjE3NjM1LDQuODY3OTE3MSA0Ljg2NzY5ODUsNC44Njc5MTcxIDEuMjE2OTk5NywwIDIuMzE2OTk5NSwtMC40NDQ1ODcgMy4xODI5MTcyLC0xLjE3MDA5MjEgdiAwLjMwNDIyIGMgMCwwLjA3MDkxMiAwLjAyMzI4OCwwLjE0MDE4NTEgMC4wNjk1ODQsMC4yMTA1NTExIGwgMi44MzE3MTYxLDIuODMxODM1IGMgMC4xMTcxNTYsMC4xMTcxNTUgMC4zMDQyMiwwLjExNzE1NSAwLjM5Nzc5OCwwIGwgMC41MzgyNTcsLTAuNTM4MjU3IGMgMC4xMTcxNTYsLTAuMDkzOTQgMC4xMTcxNTYsLTAuMjgwNzM1IDAsLTAuMzk3Nzk5IHogTSA1Ljg3OTc3OTcsOS42MTI4NjU1IGMgLTIuMDgyNzcxLDAgLTMuNzQ0NDQ5NSwtMS42NjE3MTU0IC0zLjc0NDQ0OTUsLTMuNzQ0NjMyNiAwLC0yLjA1OTMzOTggMS42NjE2Nzg1LC0zLjc0NDQ1ODYgMy43NDQ0NDk1LC0zLjc0NDQ1ODYgMi4wNTk0ODYxLDAgMy43NDQ2MzI0LDEuNjg1MTE4OCAzLjc0NDYzMjQsMy43NDQ0NTg2IDAsMi4wODI5MTcyIC0xLjY4NTE0NjMsMy43NDQ2MzI2IC0zLjc0NDYzMjQsMy43NDQ2MzI2IHoiIGZpbGw9IiMwMDAiIGlkPSJwYXRoMiIgc3R5bGU9InN0cm9rZS13aWR0aDowLjkxMzg0OCIgLz4KPC9zdmc+Cg==);

    --icon-folder-007fff: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTkuMTcgNkwxMS4xNyA4SDIwVjE4SDRWNkg5LjE3Wk0xMCA0SDRDMi45IDQgMi4wMSA0LjkgMi4wMSA2TDIgMThDMiAxOS4xIDIuOSAyMCA0IDIwSDIwQzIxLjEgMjAgMjIgMTkuMSAyMiAxOFY4QzIyIDYuOSAyMS4xIDYgMjAgNkgxMkwxMCA0WiIgZmlsbD0iIzAwN2ZmZiIvPgo8L3N2Zz4K);
@@ -132,4 +135,7 @@ 
    --icon-tasks-tasks-808080: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0IiB2aWV3Qm94PSIwIDAgMTQgMTQiIGZpbGw9Im5vbmUiIHZlcnNpb249IjEuMSIgaWQ9InN2ZzQiIHNvZGlwb2RpOmRvY25hbWU9InRhc2tzLnN2ZyIgaW5rc2NhcGU6dmVyc2lvbj0iMS4xIChjNjhlMjJjMzg3LCAyMDIxLTA1LTIzKSIKICAgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiCiAgIHhtbG5zOnNvZGlwb2RpPSJodHRwOi8vc29kaXBvZGkuc291cmNlZm9yZ2UubmV0L0RURC9zb2RpcG9kaS0wLmR0ZCIKICAgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIgogICB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgPGRlZnMgaWQ9ImRlZnM4IiAvPgogICA8c29kaXBvZGk6bmFtZWR2aWV3IGlkPSJuYW1lZHZpZXc2IiBwYWdlY29sb3I9IiM1MDUwNTAiIGJvcmRlcmNvbG9yPSIjZmZmZmZmIiBib3JkZXJvcGFjaXR5PSIxIiBpbmtzY2FwZTpwYWdlc2hhZG93PSIwIiBpbmtzY2FwZTpwYWdlb3BhY2l0eT0iMCIgaW5rc2NhcGU6cGFnZWNoZWNrZXJib2FyZD0iMSIgc2hvd2dyaWQ9ImZhbHNlIiBoZWlnaHQ9IjE1cHgiIGlua3NjYXBlOnpvb209IjMxLjYzNjM2NCIgaW5rc2NhcGU6Y3g9IjQuNDI1Mjg3MyIgaW5rc2NhcGU6Y3k9IjYuOTA2NjA5MSIgaW5rc2NhcGU6d2luZG93LXdpZHRoPSIxOTIwIiBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSIxMDE3IiBpbmtzY2FwZTp3aW5kb3cteD0iLTgiIGlua3NjYXBlOndpbmRvdy15PSItOCIgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMSIgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnNCIgLz4KICAgPHBhdGggZD0iTSAxMS43MTM0ODksMi40NzAzNTQzIDQuODA3MzM4NCw5LjM3NjM2NjUgMi4yODY0ODg0LDYuODI5Mzk1IGMgLTAuMTMxODI3OSwtMC4xMDQ4OTExIC0wLjM0MTIyNDksLTAuMTA0ODkxMSAtMC40NDYyNjgyLDAgTCAxLjA3ODY3MzcsNy41OTA3NzQ5IGMgLTAuMTA0ODk4MTgsMC4xMDQ5IC0wLjEwNDg5ODE4LDAuMzE1MTc0NSAwLDAuNDQ2NDM4MyBsIDMuNTE4NTg3MiwzLjQ5MjQ0MTggYyAwLjEzMTgzNjksMC4xMzE4MTkgMC4zMTUxODM1LDAuMTMxODE5IDAuNDQ2NDQ3MiwwIEwgMTIuOTIxMzUxLDMuNjUyMDQ3IGMgMC4xMDQ4NjUsLTAuMTA0OSAwLjEwNDg2NSwtMC4zMTUwNDAyIDAsLTAuNDQ2NDQ3MyBMIDEyLjE1OTgxLDIuNDcwMzU0MyBjIC0wLjEwNDk1MywtMC4xMzE4MzExIC0wLjMxNTA0LC0wLjEzMTgzMTEgLTAuNDQ2MzIxLDAgeiIgZmlsbD0iIzgwODA4MCIgaWQ9InBhdGgyIiBzdHlsZT0ic3Ryb2tlLXdpZHRoOjAuODk1NTEyIiAvPgo8L3N2Zz4K);

    --icon-picture-ffffff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdib3g9IjAgMCAxNiAxNiIgd2lkdGg9IjE2IiB2ZXJzaW9uPSIxLjEiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Im0xLjUgMmMtMC4yIDAtMC41IDAuMy0wLjUgMC41djExYzAgMC4yIDAuMyAwLjUgMC41IDAuNWgxM2MwLjIgMCAwLjUtMC4zIDAuNS0wLjV2LTExYzAtMC4yLTAuMy0wLjUtMC41LTAuNXptMC41IDFoMTJ2NWwtMS0xLTMgNC0zLTMtNCA0aC0xem0yLjUgMWMtMC44MyAwLTEuNSAwLjY3LTEuNSAxLjVzMC42NyAxLjUgMS41IDEuNSAxLjUtMC42NyAxLjUtMS41LTAuNjctMS41LTEuNS0xLjV6IiBmaWxsPSIjZmZmZmZmIi8+PC9zdmc+Cg==);

    --icon-template-add-808080: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMS4zMyAyMS4zMyIgd2lkdGg9IjE2IiBoZWlnaHQ9IjE2Ij48cGF0aCBmaWxsPSJub25lIiBkPSJNMCAwaDI0djI0SDB6Ii8+PHBhdGggZD0iTTE1LjMzIDE4aC0xMlY2SDEwVjRIMy4zM2EyIDIgMCAwMC0yIDJ2MTJjMCAxLjEuOSAyIDIgMmgxMmEyIDIgMCAwMDItMnYtNi42N2gtMnpNMTcuMzMgMS4zM2gtMlY0aC0yLjY2djJoMi42NnYyLjY3aDJWNkgyMFY0aC0yLjY3eiIgZmlsbD0iIzgwODA4MCIvPjxwYXRoIGQ9Ik01LjMzIDE0LjMzaDh2MmgtOHptOC0xLjMzdi0yaC04djJ6bS04LTUuMzNoOHYyaC04eiIgZmlsbD0iIzgwODA4MCIvPjwvc3ZnPg==);

    --icon-confirm-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdib3g9IjAgMCAxNiAxNiIgd2lkdGg9IjE2IiB2ZXJzaW9uPSIxLjEiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Im04LjUgMC41Yy0wLjg5NzQgMC0xLjM0MDQgMS4wOTA5LTAuNjk3MyAxLjcxNjhsNC43ODM3IDQuNzgzMmgtMTEuNTczYy0xLjM1MjMtMC4wMTkxMjUtMS4zNTIzIDIuMDE5MSAwIDJoMTEuNTcybC00Ljc4MzIgNC43ODMyYy0wLjk4MTYzIDAuOTQyNTEgMC40NzE1NSAyLjM5NTcgMS40MTQxIDEuNDE0MWw2LjQ5MTEtNi40OWMwLjM4Ny0wLjM4NzggMC4zOTEtMS4wMjI4IDAtMS40MTRsLTYuNDkwNi02LjQ5MDNjLTAuMTg4My0wLjE5MzUtMC40NDY4LTAuMzAyNjgtMC43MTY4LTAuMzAyN3oiIGZpbGw9IiMwMDAiLz48L3N2Zz4K);

    --icon-upload-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld2JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik04IDFMMiA3aDR2NGg0VjdoNHpNMiAxM3YyaDEydi0yeiIgZmlsbD0iIzAwMCIvPjwvc3ZnPgo=);

    --icon-upload-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld2JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik04IDFMMiA3aDR2NGg0VjdoNHpNMiAxM3YyaDEydi0yeiIgZmlsbD0iI2ZmZiIvPjwvc3ZnPgo=);

}

lib/Listeners/BeforeTemplateRenderedListener.php

+12 −0
Original line number Diff line number Diff line
@@ -52,6 +52,18 @@ class BeforeTemplateRenderedListener implements IEventListener { 
		if (strpos($pathInfo, '/apps/calendar/') !== false) {

			$this->util->addStyle($this->appName, 'calendar');

		}

		if (strpos($pathInfo, '/apps/news/') !== false) {

			$this->util->addStyle($this->appName, 'news');

		}

		if (strpos($pathInfo, '/apps/notes/') !== false) {

			$this->util->addStyle($this->appName, 'notes');

		}

		if (strpos($pathInfo, '/apps/deck/') !== false) {

			$this->util->addStyle($this->appName, 'deck');

		}

		if (strpos($pathInfo, '/apps/bookmarks/') !== false) {

			$this->util->addStyle($this->appName, 'bookmarks');

		}

		$response = $event->getResponse();

		if ($pathInfo === '/settings/user' && $response->getTemplateName() === 'settings/frame') {

			$this->util->addScript($this->appName, $this->appName . '-personal-info-settings');

scss/bookmarks.scss

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#app-settings {

	.icon-download {

		background-image: var(--icon-download-000);

	}

}

scss/calendar.scss

+6 −0
Original line number Diff line number Diff line
@@ -37,3 +37,9 @@ input[type='reset'] { 
    background-color: var(--color-primary-element);

    color: var(--color-primary-text);

}

.content.app-calendar .button-vue.datepicker-button-section__next.button.button-vue--icon-only.button-vue--vue-secondary,

.content.app-calendar .button-vue.datepicker-button-section__previous.button.button-vue--icon-only.button-vue--vue-secondary,

.content.app-calendar .button-vue.datepicker-button-section__datepicker-label.button.datepicker-label.button-vue--text-only.button-vue--vue-secondary {

    background-color: unset;

    color: var(--color-main-text);

}

scss/contacts.scss

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    .multiselect .multiselect__content-wrapper .multiselect__content li > span.multiselect__option,

    div.select2-container-multi .select2-choices,

    div.select2-container-multi.select2-container-active .select2-choices {

        background: var(--color-main-background);

        background-color: var(--color-main-background);

    }

    #content-vue.app-contacts .property.property--without-actions.property--last.property-masonry:not(.property--addressbooks):not(.property--groups) .multiselect .multiselect__tags .multiselect__input,

    #content-vue.app-contacts .multiselect .multiselect__tags input.multiselect__input,