nextcloud · avinash-0007 · Jun 21, 2023 · Jun 21, 2023
@@ -130,61 +130,61 @@
 [Full Changelog](https://github.com/nextcloud/contacts/compare/v4.0.0...v4.0.1)
 
 ### Enhancements
-- Streamlined Settings 
+- Streamlined Settings
   [\#2372](https://github.com/nextcloud/contacts/pull/2372) ([szaimen](https://github.com/szaimen))
-- Wording improvements 
+- Wording improvements
   [\#2350](https://github.com/nextcloud/contacts/pull/2350) ([Valdnet](https://github.com/Valdnet))
 - Various dependencies updates
 
 ### Fixed
-- Fixed dark contacts icon 
+- Fixed dark contacts icon
   [\#2340](https://github.com/nextcloud/contacts/pull/2340) ([skjnldsv](https://github.com/skjnldsv))
-- Adjusted the padding of app-content-details 
-  [\#2341](https://github.com/nextcloud/contacts/pull/2341) ([szaimen](https://github.com/szaimen)) 
+- Adjusted the padding of app-content-details
+  [\#2341](https://github.com/nextcloud/contacts/pull/2341) ([szaimen](https://github.com/szaimen))
 - Fixed call on null in SocialApiService
-  [\#2351](https://github.com/nextcloud/contacts/pull/2351) ([juliushaertl](https://github.com/juliushaertl)) 
+  [\#2351](https://github.com/nextcloud/contacts/pull/2351) ([juliushaertl](https://github.com/juliushaertl))
 
 ## 4.0.0 - 2021-07-06
 
 [Full Changelog](https://github.com/nextcloud/contacts/compare/v3.5.1...v4.0.0)
 
 ### Featured enhancement
-- Circles integration 
+- Circles integration
   [\#2098](https://github.com/nextcloud/contacts/pull/2098) ([skjnldsv](https://github.com/skjnldsv))
 
 ### Enhancements
-- Comply to new resizeable list feature 
+- Comply to new resizeable list feature
   [\#2246](https://github.com/nextcloud/contacts/pull/2246) ([skjnldsv](https://github.com/skjnldsv))
-- Bump deps and use npm7 
+- Bump deps and use npm7
   [\#2281](https://github.com/nextcloud/contacts/pull/2281) ([skjnldsv](https://github.com/skjnldsv))
-- Bump dependencies and webpack 5 
+- Bump dependencies and webpack 5
   [\#2140](https://github.com/nextcloud/contacts/pull/2140) ([skjnldsv](https://github.com/skjnldsv))
-- Remove core-js 
+- Remove core-js
   [\#2323](https://github.com/nextcloud/contacts/pull/2323) ([skjnldsv](https://github.com/skjnldsv))
 - Various dependencies updates
 
 ### Fixed
-- Improve Compatibily with macOS Contacts 
+- Improve Compatibily with macOS Contacts
   [\#1999](https://github.com/nextcloud/contacts/pull/1999) ([zlajo](https://github.com/zlajo))
-- Fix chain condition of responses 
+- Fix chain condition of responses
   [\#2286](https://github.com/nextcloud/contacts/pull/2286) ([skjnldsv](https://github.com/skjnldsv))
-- Increase max-version to current dev version 22 
+- Increase max-version to current dev version 22
   [\#2169](https://github.com/nextcloud/contacts/pull/2169) ([jancborchardt](https://github.com/jancborchardt))
-- l10n: Change spelling 
+- l10n: Change spelling
   [\#2189](https://github.com/nextcloud/contacts/pull/2189) ([Valdnet](https://github.com/Valdnet))
-- l10n: Change to lowercase 
+- l10n: Change to lowercase
   [\#2190](https://github.com/nextcloud/contacts/pull/2190) ([Valdnet](https://github.com/Valdnet))
-- l10n: Correct spelling 
+- l10n: Correct spelling
   [\#2244](https://github.com/nextcloud/contacts/pull/2244) ([Valdnet](https://github.com/Valdnet))
-- l10n: Spelling unification 
+- l10n: Spelling unification
   [\#2233](https://github.com/nextcloud/contacts/pull/2233) ([Valdnet](https://github.com/Valdnet))
-- l10n: Unify spelling 
+- l10n: Unify spelling
   [\#2162](https://github.com/nextcloud/contacts/pull/2162) ([Valdnet](https://github.com/Valdnet))
-- l10n: Error message changed 
+- l10n: Error message changed
   [\#2326](https://github.com/nextcloud/contacts/pull/2326) ([Valdnet](https://github.com/Valdnet))
-- l10n: Change to a capital letter 
+- l10n: Change to a capital letter
   [\#2305](https://github.com/nextcloud/contacts/pull/2305) ([Valdnet](https://github.com/Valdnet))
-- l10n: Change to a capital letter 
+- l10n: Change to a capital letter
   [\#2304](https://github.com/nextcloud/contacts/pull/2304) ([Valdnet](https://github.com/Valdnet))
 
 ## 3.5.1 - 2021-03-17
@@ -554,7 +554,7 @@
   [#923](https://github.com/nextcloud/contacts/issues/923)
   [#968](https://github.com/nextcloud/contacts/issues/968)
 - White icons fix for preview
-  [91dd5c38df05ebb9247df4611703beffa6d08b0e](https://github.com/nextcloud/contacts/commit/91dd5c38df05ebb9247df4611703beffa6d08b0e) 
+  [91dd5c38df05ebb9247df4611703beffa6d08b0e](https://github.com/nextcloud/contacts/commit/91dd5c38df05ebb9247df4611703beffa6d08b0e)
 - Validate on app initialisation
   [#973](https://github.com/nextcloud/contacts/issues/973)
 - Fix gender select + auto repair
@@ -654,4 +654,4 @@
 - #545, Social Network types drop-down is missing "Mastodon"
 - #547, Company contact entries don't display properly on load
 - #585, Click on a non existing contact results in a endless spinner
-- #592, Inconsistent use of username when sharing an address book
+- #592, Inconsistent use of username when sharing an address book
@@ -32,5 +32,6 @@
 		['name' => 'social_api#set_app_config',	 'url' => '/api/v1/social/config/global/{key}', 'verb' => 'PUT'],
 		['name' => 'social_api#set_user_config', 'url' => '/api/v1/social/config/user/{key}', 'verb' => 'PUT'],
 		['name' => 'social_api#get_user_config', 'url' => '/api/v1/social/config/user/{key}', 'verb' => 'GET'],
+		['name' => 'contacts#searchUsers', 'url' => '/v1/autocompletion/addressbookusers', 'verb' => 'POST'],
 	]
 ];
@@ -52,13 +52,22 @@ $property-row-gap: $contact-details-row-gap;
 	}
 
 	// property label or multiselect within row
+<<<<<<< HEAD
 	&__label {
 		// Global single column layout
 		display: flex;
 		flex: 0 1 auto;
 		justify-content: flex-end;
 		width: $contact-details-label-max-width;
 		min-width: 0; // Has to be zero unless we implement wrapping
+=======
+	&__label,
+	&__label.multiselect {
+		flex: 1 0; // min width is 60px, let's grow until 120px
+		width: $property-label-min-width;
+		min-width: $property-label-min-width !important; // override multiselect
+		max-width: $property-label-max-width;
+>>>>>>> 9c2363a718b099a3370c2d110908fb40bf0dc4a3
 
 		// Text label styling
 		> :not(.multiselect):not(.material-design-icon) {
@@ -79,6 +88,7 @@ $property-row-gap: $contact-details-row-gap;
 		width: $property-value-max-width;
 		min-width: 0; // Has to be zero unless we implement wrapping
 
+<<<<<<< HEAD
 		textarea {
 			// Limit max height to make scrolling the form a bit easier
 			min-height: 2 * $grid-height-unit - 2*$grid-input-margin;
@@ -99,11 +109,17 @@ $property-row-gap: $contact-details-row-gap;
 				padding: 0;
 				border-radius: 0;
 			}
+=======
+	&__label.multiselect {
+		.multiselect__tags {
+			border: none !important; // override multiselect
+>>>>>>> 9c2363a718b099a3370c2d110908fb40bf0dc4a3
 		}
 	}
 
 	&__label,
 	&__value {
+<<<<<<< HEAD
 		// Fix default multiselect styling
 		> .multiselect {
 			width: 100%;
@@ -113,6 +129,23 @@ $property-row-gap: $contact-details-row-gap;
 		// Fix default date time picker styling
 		> .mx-datepicker {
 			width: 100%;
+=======
+		flex: 1 1;
+
+		textarea {
+			align-self: flex-start;
+			min-height: 2 * $grid-height-unit - 2*$grid-input-margin;
+			max-height: 5 * $grid-height-unit - 2*$grid-input-margin;
+		}
+
+		// read-only mode
+		&:read-only {
+			border-color: var(--color-border-dark);
+		}
+		&--with-ext {
+			// ext icon width + 8px padding
+			padding-right: 24px;
+>>>>>>> 9c2363a718b099a3370c2d110908fb40bf0dc4a3
 		}
 	}
 

@@ -33,7 +33,7 @@
 	&__shareematch--bold {
 		font-weight: bold;
 	}
-	
+
 	.icon-loading::after {
 		top: 70%;
 		left: 95%;
@@ -44,7 +44,7 @@
 	.multiselect {
 		width: inherit;
 		margin: 0;
-		.multiselect__tags:focus-within, 
+		.multiselect__tags:focus-within,
 		.multiselect__tags:hover {
 			border-color: var(--color-primary-element);
 		}
@@ -53,4 +53,40 @@
 			display: none;
 		}
 	}
-}
+}
+
+.addressbook-search__multiselect {
+	width: 100%;
+	.addressbook-search-list-item {
+		display: flex;
+		align-items: center;
+		width: 100%;
+
+		// Account for avatar width (because it is position: relative)
+		padding-right: 32px;
+
+		&__label {
+			width: 100%;
+			padding: 0 8px;
+
+			&__availability {
+				color: var(--color-text-maxcontrast);
+			}
+
+			div {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+
+			div:nth-child(1) {
+				color: var(--color-main-text);
+			}
+
+			div:nth-child(2) {
+				color: var(--color-text-lighter);
+				line-height: 1;
+			}
+		}
+	}
+}
@@ -37,10 +37,25 @@ $grid-input-height-with-margin: $grid-height-unit - $grid-input-margin * 2;
 
 // various
 @import 'animations';
+<<<<<<< HEAD
 
 .app-content-details {
 	padding: calc(var(--default-grid-baseline) * 2);
 	padding-top: 0;
+=======
+
+
+// global design overrides
+.app-content {
+	// center error messages
+	& > .empty-content {
+		margin: 40vh;
+	}
+}
+
+.app-content-details {
+	padding: 0 44px 80px 44px;
+>>>>>>> 9c2363a718b099a3370c2d110908fb40bf0dc4a3
 	height: 100%;
 	overflow: auto;
 

@@ -31,6 +31,7 @@ OC.L10N.register(
     "Pending" : "Hangend",
     "Select type" : "Kies tipe",
     "Select Date" : "Kies Datum",
+    "None" : "Geen",
     "Select option" : "Kies opsie",
     "Close" : "Sluit",
     "Import" : "Voer In",
@@ -94,7 +95,6 @@ OC.L10N.register(
     "Gender" : "Geslag",
     "Female" : "Vroulik",
     "Male" : "Manlik",
-    "None" : "Geen",
     "Unknown" : "Onbekend"
 },
 "nplurals=2; plural=(n != 1);");
@@ -29,6 +29,7 @@
     "Pending" : "Hangend",
     "Select type" : "Kies tipe",
     "Select Date" : "Kies Datum",
+    "None" : "Geen",
     "Select option" : "Kies opsie",
     "Close" : "Sluit",
     "Import" : "Voer In",
@@ -92,7 +93,6 @@
     "Gender" : "Geslag",
     "Female" : "Vroulik",
     "Male" : "Manlik",
-    "None" : "Geen",
     "Unknown" : "Onbekend"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Circles" : "جماعة",
     "Download" : "تحميل",
     "Rename" : "تعديل الإسم",
+    "Enabled" : "مفعلة",
     "Delete" : "حذف",
     "Copied" : "نُسخت ",
     "Copy link" : "نسخ الرابط",
@@ -46,6 +47,7 @@ OC.L10N.register(
     "Personal circle" : "حلقة شخصية",
     "Pending" : "معلّق",
     "Select Date" : "اختر التاريخ ",
+    "None" : "لا شيء",
     "Select option" : "حدد الخيار",
     "Close" : "إغلاق",
     "Import" : "استيراد",
@@ -91,7 +93,6 @@ OC.L10N.register(
     "Voice" : "صوت",
     "Social network" : "شبكة اجتماعية",
     "Relative" : "مرتبط",
-    "None" : "لا شيء",
     "Unknown" : "مجهول"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
@@ -10,6 +10,7 @@
     "Circles" : "جماعة",
     "Download" : "تحميل",
     "Rename" : "تعديل الإسم",
+    "Enabled" : "مفعلة",
     "Delete" : "حذف",
     "Copied" : "نُسخت ",
     "Copy link" : "نسخ الرابط",
@@ -44,6 +45,7 @@
     "Personal circle" : "حلقة شخصية",
     "Pending" : "معلّق",
     "Select Date" : "اختر التاريخ ",
+    "None" : "لا شيء",
     "Select option" : "حدد الخيار",
     "Close" : "إغلاق",
     "Import" : "استيراد",
@@ -89,7 +91,6 @@
     "Voice" : "صوت",
     "Social network" : "شبكة اجتماعية",
     "Relative" : "مرتبط",
-    "None" : "لا شيء",
     "Unknown" : "مجهول"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
@@ -2,10 +2,7 @@ OC.L10N.register(
     "contacts",
     {
     "All contacts" : "Tolos contautos",
-    "Loading circle …" : "Cargando'l círculu…",
     "Loading …" : "Cargando…",
-    "_%n group_::_%n groups_" : ["%n grupu","%n grupos"],
-    "Description" : "Descripción",
     "An error occurred while trying to move the contact" : "Prodúxose un error al tentar de mover el contautu",
     "An error occurred while trying to copy the contact" : "Prodúxose un error al tentar de copiar el contautu",
     "_{count} error_::_{count} errors_" : ["{count} error","{count} errores"],
@@ -18,9 +15,6 @@ OC.L10N.register(
     "State or province" : "Estáu o provincia",
     "Postal code" : "Códigu postal",
     "Country" : "País",
-    "Instant messaging" : "Mensaxería instantanea",
-    "Fax" : "Fax",
-    "Pager" : "Buscapersones",
     "Agent" : "Axente"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,9 +1,6 @@
 { "translations": {
     "All contacts" : "Tolos contautos",
-    "Loading circle …" : "Cargando'l círculu…",
     "Loading …" : "Cargando…",
-    "_%n group_::_%n groups_" : ["%n grupu","%n grupos"],
-    "Description" : "Descripción",
     "An error occurred while trying to move the contact" : "Prodúxose un error al tentar de mover el contautu",
     "An error occurred while trying to copy the contact" : "Prodúxose un error al tentar de copiar el contautu",
     "_{count} error_::_{count} errors_" : ["{count} error","{count} errores"],
@@ -16,9 +13,6 @@
     "State or province" : "Estáu o provincia",
     "Postal code" : "Códigu postal",
     "Country" : "País",
-    "Instant messaging" : "Mensaxería instantanea",
-    "Fax" : "Fax",
-    "Pager" : "Buscapersones",
     "Agent" : "Axente"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }