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

Commit ff68a7c1 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'dev/ui-nc25-issue' into 'main' 

UI fixes for memories and contact app

See merge request e/infra/ecloud/nextcloud-apps/ecloud-theme-helper!78
parents 0eec9ee6 332c5496

lib/Listeners/BeforeTemplateRenderedListener.php

+3 −0
Original line number Diff line number Diff line
@@ -101,5 +101,8 @@ class BeforeTemplateRenderedListener implements IEventListener { 
		if (strpos($pathInfo, '/settings/user/groupware') !== false) {

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

		}

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

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

		}

	}

}

scss/contacts.scss

+7 −4
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ 
		border-radius: var(--border-radius);

	}

	.contacts-settings .button-vue.contacts-settings-button{

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

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

		background-color: var(--color-primary-element);

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

	}

	.contacts-settings .button-vue.contacts-settings-button:hover{

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

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

		background-color: var(--color-primary-element);

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

		opacity: 0.8;

	}

	.property__label.multiselect .multiselect__tags{
@@ -44,3 +44,6 @@ 
	display: none;

}



.modal-container button.button-vue.import-contact__button{

	min-width: fit-content;

}
 
 No newline at end of file

scss/memories.scss

0 → 100644
+3 −0
Original line number Diff line number Diff line 
.app-settings .app-settings__navigation {

	display: none;

}

scss/settings-drop-account.scss

+3 −0
Original line number Diff line number Diff line
@@ -3,3 +3,6 @@ 
#body-settings .settings-section__desc {

	opacity: 1.0;

}

#body-settings .icon.icon-delete {

    background-image: var(--icon-delete-ffffff);

}
 
 No newline at end of file

src/icons.js

+4 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ const colors = { 
	orange: 'eca700',

	green: '46ba61',

	grey: '969696',

	lightgrey: '808080'

	lightgrey: '808080',

}



const variables = {}
@@ -43,12 +43,12 @@ const icons = { 
const iconsColor = {

	'search': {

		path: path.join(__dirname, '../img', 'actions', 'search.svg'),

		color: 'lightgrey'

		color: 'lightgrey',

	},

	'notifications': {

		path: path.join(__dirname, '../img', 'notifications', 'notifications.svg'),

		color: 'lightgrey'

	}

		color: 'lightgrey',

	},

}



// use this to define aliases to existing icons