Merge pull request #27566 from nextcloud/fix/device-login-styles

Update Login with device page styles
nextcloud · Jun 22, 2021 · d1001f7 · d1001f7
2 parents b518d9e + 08d59bb
commit d1001f7
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 74 deletions.
diff --git a/core/css/guest.css b/core/css/guest.css
@@ -662,6 +662,10 @@ form #selectDbType label span {
 .groupbottom input[type=submit] {
 	box-shadow: none !important;
 }
+.grouptop.groupbottom input {
+	border-radius: 3px !important;
+	margin: 5px 0 !important;
+}
 
 #install-recommended-apps + label span {
 	display: inline-block;

diff --git a/core/js/dist/files_client.js b/core/js/dist/files_client.js
diff --git a/core/js/dist/files_client.js.map b/core/js/dist/files_client.js.map
diff --git a/core/js/dist/files_fileinfo.js b/core/js/dist/files_fileinfo.js
diff --git a/core/js/dist/files_fileinfo.js.map b/core/js/dist/files_fileinfo.js.map
diff --git a/core/js/dist/files_iedavclient.js b/core/js/dist/files_iedavclient.js
diff --git a/core/js/dist/files_iedavclient.js.map b/core/js/dist/files_iedavclient.js.map
diff --git a/core/js/dist/install.js b/core/js/dist/install.js
diff --git a/core/js/dist/install.js.map b/core/js/dist/install.js.map
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
diff --git a/core/js/dist/maintenance.js.map b/core/js/dist/maintenance.js.map
diff --git a/core/js/dist/recommendedapps.js b/core/js/dist/recommendedapps.js
diff --git a/core/js/dist/recommendedapps.js.map b/core/js/dist/recommendedapps.js.map
diff --git a/core/js/dist/unified-search.js b/core/js/dist/unified-search.js
diff --git a/core/js/dist/unified-search.js.map b/core/js/dist/unified-search.js.map
diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
@@ -6,6 +6,7 @@
 		@submit.prevent="submit">
 		<fieldset>
 			<p class="grouptop groupbottom">
+				<label for="user" class="infield">{{ t('core', 'Username or	email') }}</label>
 				<input id="user"
 					ref="user"
 					v-model="user"
@@ -16,10 +17,9 @@
 					:aria-label="t('core', 'Username or email')"
 					required
 					@change="$emit('update:username', user)">
-				<label for="user" class="infield">{{ t('core', 'Username or	email') }}</label>
 			</p>
 
-			<div v-if="!validCredentials">
+			<div v-if="!validCredentials" class="body-login-container update form__message-box">
 				{{ t('core', 'Your account is not setup for passwordless login.') }}
 			</div>
 
@@ -29,11 +29,19 @@
 				@click="authenticate" />
 		</fieldset>
 	</form>
-	<div v-else-if="!hasPublicKeyCredential">
-		{{ t('core', 'Passwordless authentication is not supported in your browser.') }}
+	<div v-else-if="!hasPublicKeyCredential" class="body-login-container update">
+		<InformationIcon size="70" />
+		<h2>{{ t('core', 'Browser not supported') }}</h2>
+		<p class="infogroup">
+			{{ t('core', 'Passwordless authentication is not supported in your browser.') }}
+		</p>
 	</div>
-	<div v-else-if="!isHttps && !isLocalhost">
-		{{ t('core', 'Passwordless authentication is only available over a secure connection.') }}
+	<div v-else-if="!isHttps && !isLocalhost" class="body-login-container update">
+		<LockOpenIcon size="70" />
+		<h2>{{ t('core', 'Your connection is not secure') }}</h2>
+		<p class="infogroup">
+			{{ t('core', 'Passwordless authentication is only available over a secure connection.') }}
+		</p>
 	</div>
 </template>
 
@@ -43,6 +51,8 @@ import {
 	finishAuthentication,
 } from '../../services/WebAuthnAuthenticationService'
 import LoginButton from './LoginButton'
+import InformationIcon from 'vue-material-design-icons/Information'
+import LockOpenIcon from 'vue-material-design-icons/LockOpen'
 
 class NoValidCredentials extends Error {
 
@@ -52,6 +62,8 @@ export default {
 	name: 'PasswordLessLoginForm',
 	components: {
 		LoginButton,
+		InformationIcon,
+		LockOpenIcon,
 	},
 	props: {
 		username: {
@@ -211,6 +223,13 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+	.body-login-container.update {
+		margin: 15px 0;
 
+		&.form__message-box {
+			width: 240px;
+			margin: 5px;
+		}
+	}
 </style>