Fix rebasing issues and improve profile settings page a bit more

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

apps/files_sharing/src/components/SharingEntry.vue

@@ -78,9 +78,9 @@
 					{{ t('files_sharing', 'Allow resharing') }}
 				</NcActionCheckbox>
 
-				<NcActionCheckbox v-if="isSetDownloadButtonVisible"
-					ref="canDownload"
+				<NcActionCheckbox ref="canDownload"
 					:checked.sync="canDownload"
+					v-if="isSetDownloadButtonVisible"
 					:disabled="saving || !canSetDownload">
 					{{ allowDownloadText }}
 				</NcActionCheckbox>

apps/settings/css/settings.css

@@ -169,7 +169,9 @@ input#openid, input#webdav {
   grid-template-rows: 1fr 1fr 1fr 2fr;
 }
 .profile-settings-container #locale h3 {
-  height: 32px;
+  height: 44px;
+  display: flex;
+  align-items: center;
 }
 
 .personal-show-container {
@@ -311,6 +313,8 @@ select#timezone, select#languageinput, select#localeinput {
   flex-wrap: nowrap;
   justify-content: flex-start;
   width: 100%;
+  align-items: center;
+  gap: 8px;
 }
 .personal-settings-container > div h3 > label {
   white-space: nowrap;
@@ -384,7 +388,7 @@ select#timezone, select#languageinput, select#localeinput {
   width: 44px;
   height: 44px;
   padding: 10px;
-  margin: -12px 0 0 8px;
+  margin: 0;
   background: none;
   border: none;
 }

apps/settings/css/settings.scss

@@ -120,7 +120,9 @@ input {
 
 	#locale {
 		h3 {
-			height: 32px;
+			height: 44px;
+			display: flex;
+			align-items: center;
 		}
 	}
 }
@@ -300,6 +302,8 @@ select {
 			flex-wrap: nowrap;
 			justify-content: flex-start;
 			width: 100%;
+			align-items: center;
+			gap: 8px;
 
 			> label {
 				white-space: nowrap;
@@ -391,7 +395,7 @@ select {
 	width: 44px;
 	height: 44px;
 	padding: 10px;
-	margin: -12px 0 0 8px;
+	margin: 0;
 	background: none;
 	border: none;
 

apps/settings/src/components/PersonalInfo/shared/AccountPropertySection.vue

@@ -205,35 +205,11 @@ section {
 			resize: vertical;
 			grid-area: 1 / 1;
 			width: 100%;
-			margin: 3px 3px 3px 0;
-			padding: 7px 6px;
-			color: var(--color-main-text);
-			border: 1px solid var(--color-border-dark);
-			border-radius: var(--border-radius);
-			background-color: var(--color-main-background);
-			font-family: var(--font-face);
-			cursor: text;
-
-			&:hover,
-			&:focus,
-			&:active {
-				border-color: var(--color-primary-element) !important;
-				outline: none !important;
-			}
 		}
 
 		input {
 			grid-area: 1 / 1;
 			width: 100%;
-			height: 34px;
-			margin: 3px 3px 3px 0;
-			padding: 7px 6px;
-			color: var(--color-main-text);
-			border: 1px solid var(--color-border-dark);
-			border-radius: var(--border-radius);
-			background-color: var(--color-main-background);
-			font-family: var(--font-face);
-			cursor: text;
 		}
 
 		.property__actions-container {

apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue

@@ -130,6 +130,8 @@ export default {
 		display: inline-flex;
 		width: 100%;
 		margin: 12px 0 0 0;
+		gap: 8px;
+		align-items: center;
 		font-size: 16px;
 		color: var(--color-text-light);
 
@@ -138,7 +140,7 @@ export default {
 		}
 
 		&.setting-property {
-			height: 32px;
+			height: 44px;
 		}
 
 		label {
@@ -147,10 +149,10 @@ export default {
 	}
 
 	.federation-control {
-		margin: -12px 0 0 8px;
+		margin: 0;
 	}
 
 	.button-vue  {
-		margin: -6px 0 0 auto !important;
+		margin: 0 0 0 auto !important;
 	}
 </style>

apps/settings/templates/settings/personal/security/password.php

@@ -41,7 +41,7 @@ if ($_['passwordChangeSupported']) {
 			<div class="input-control">
 				<label for="pass1"><?php p($l->t('Current password')); ?>: </label>
 				<input type="password" id="pass1" name="oldpassword"
-					   placeholder="<?php p($l->t('Current password'));?>"
+					   placeholder="<?php p($l->t('Your current password'));?>"
 					   autocomplete="current-password" autocapitalize="none" autocorrect="off" />
 			</div>
 
@@ -49,7 +49,7 @@ if ($_['passwordChangeSupported']) {
 				<label for="pass2" ><?php p($l->t('New password'));?>: </label>
 				<input type="password" id="pass2" name="newpassword"
 					   maxlength="469"
-					   placeholder="<?php p($l->t('New password')); ?>"
+					   placeholder="<?php p($l->t('Your new password')); ?>"
 					   data-typetoggle="#personal-show"
 					   autocomplete="new-password" autocapitalize="none" autocorrect="off" />
 				<input type="checkbox" id="personal-show" class="hidden-visually" name="show" />

apps/user_status/src/components/CustomMessageInput.vue

@@ -25,7 +25,11 @@
 				{{ visibleIcon }}
 			</NcButton>
 		</NcEmojiPicker>
+		<label class="hidden-visually" for="user_status_message">
+			{{ t('user_status', 'What is your status?') }}
+		</label>
 		<input ref="input"
+			id="user_status_message"
 			maxlength="80"
 			:disabled="disabled"
 			:placeholder="$t('user_status', 'What is your status?')"
@@ -39,8 +43,8 @@
 </template>
 
 <script>
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.vue'
-import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 
 export default {
 	name: 'CustomMessageInput',
@@ -104,7 +108,7 @@ export default {
 	flex-grow: 1;
 	position: relative;
 
-	.v-popover {
+	.v-popper {
 		position: absolute;
 	}
 

apps/user_status/src/components/SetStatusModal.vue

@@ -72,18 +72,8 @@
 
 <script>
 import { showError } from '@nextcloud/dialogs'
-<<<<<<< HEAD
-import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton'
-||||||| parent of f456d3bb0f (Various fixes)
-import EmojiPicker from '@nextcloud/vue/dist/Components/EmojiPicker'
-import Modal from '@nextcloud/vue/dist/Components/Modal'
-import ButtonVue from '@nextcloud/vue/dist/Components/Button'
-=======
-import Modal from '@nextcloud/vue/dist/Components/Modal'
-import ButtonVue from '@nextcloud/vue/dist/Components/Button'
->>>>>>> f456d3bb0f (Various fixes)
 import { getAllStatusOptions } from '../services/statusOptionsService'
 import OnlineStatusMixin from '../mixins/OnlineStatusMixin'
 import PredefinedStatusesList from './PredefinedStatusesList'
@@ -97,15 +87,7 @@ export default {
 	components: {
 		ClearAtSelect,
 		CustomMessageInput,
-<<<<<<< HEAD
-		NcEmojiPicker,
 		NcModal,
-||||||| parent of f456d3bb0f (Various fixes)
-		EmojiPicker,
-		Modal,
-=======
-		Modal,
->>>>>>> f456d3bb0f (Various fixes)
 		OnlineStatusSelect,
 		PredefinedStatusesList,
 		NcButton,

apps/workflowengine/src/components/Check.vue

@@ -191,6 +191,6 @@ export default {
 		margin-bottom: -5px;
 	}
 	.invalid {
-		border: 1px solid var(--color-error) !important;
+		border-color: var(--color-error) !important;
 	}
 </style>

core/css/inputs.css

@@ -1081,6 +1081,7 @@ label.infield {
 ::-ms-input-placeholder,
 ::-webkit-input-placeholder {
   color: var(--color-text-maxcontrast);
+  font-size: var(--default-font-size);
 }
 
 /*# sourceMappingURL=inputs.css.map */

core/css/inputs.scss

@@ -1000,4 +1000,5 @@ label.infield {
 ::-ms-input-placeholder,
 ::-webkit-input-placeholder {
 	color: var(--color-text-maxcontrast);
+    font-size: var(--default-font-size);
 }

core/css/server.css

@@ -2252,6 +2252,7 @@ label.infield {
 ::-ms-input-placeholder,
 ::-webkit-input-placeholder {
   color: var(--color-text-maxcontrast);
+  font-size: var(--default-font-size);
 }
 
 /**