From fff125e7039cc591653b05c63207888c3377df10 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Wed, 20 Oct 2021 12:21:05 +0200
Subject: [PATCH 1/2] l10n: Improve styling

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 .../ProfileVisibilitySection/ProfileVisibilitySection.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue
index c27bef347c62d..939a3d1d72b43 100644
--- a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue
+++ b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue
@@ -32,7 +32,7 @@
 			:show-display-id="true"
 			:visibility.sync="parameter.visibility" />
 
-		<em :class="{ disabled }">{{ t('settings', 'The more restrictive setting of either visibility or scope is respected on your Profile — For example, when visibility is set to "Show to everyone" and scope is set to "Private", "Private" will be respected') }}</em>
+		<em :class="{ disabled }">{{ t('settings', 'The more restrictive setting of either visibility or scope is respected on your Profile, for example: When visibility is set to "Show to everyone" and scope is set to "Private", "Private" will be respected') }}</em>
 	</section>
 </template>
 

From 012a23fa1c51577c1118a5534693bf5737613044 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Mon, 8 Nov 2021 15:58:36 +0100
Subject: [PATCH 2/2] Resolve conflict

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 .../ProfileVisibilitySection.vue              | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue
index 939a3d1d72b43..64b5bb3d2cf6f 100644
--- a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue
+++ b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue
@@ -25,14 +25,17 @@
 		<HeaderBar
 			:account-property="heading" />
 
-		<VisibilityDropdown v-for="parameter in visibilityArray"
-			:key="parameter.id"
-			:param-id="parameter.id"
-			:display-id="parameter.displayId"
-			:show-display-id="true"
-			:visibility.sync="parameter.visibility" />
-
-		<em :class="{ disabled }">{{ t('settings', 'The more restrictive setting of either visibility or scope is respected on your Profile, for example: When visibility is set to "Show to everyone" and scope is set to "Private", "Private" will be respected') }}</em>
+		<em :class="{ disabled }">
+			{{ t('settings', 'The more restrictive setting of either visibility or scope is respected on your Profile. For example, if visibility is set to "Show to everyone" and scope is set to "Private", "Private" is respected.') }}
+		</em>
+
+		<div class="visibility-dropdowns">
+			<VisibilityDropdown v-for="param in visibilityParams"
+				:key="param.id"
+				:param-id="param.id"
+				:display-id="param.displayId"
+				:visibility.sync="param.visibility" />
+		</div>
 	</section>
 </template>