Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Login with device page styles #27566

Merged
merged 1 commit into from
Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/css/guest.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/js/dist/files_client.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/files_client.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/files_fileinfo.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/files_fileinfo.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/files_iedavclient.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/files_iedavclient.js.map

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions core/js/dist/install.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/install.js.map

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions core/js/dist/login.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/login.js.map

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions core/js/dist/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/main.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/maintenance.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/maintenance.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/js/dist/recommendedapps.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/recommendedapps.js.map

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions core/js/dist/unified-search.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/unified-search.js.map

Large diffs are not rendered by default.

33 changes: 26 additions & 7 deletions core/src/components/login/PasswordLessLoginForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>

Expand All @@ -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>

Expand All @@ -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 {

Expand All @@ -52,6 +62,8 @@ export default {
name: 'PasswordLessLoginForm',
components: {
LoginButton,
InformationIcon,
LockOpenIcon,
},
props: {
username: {
Expand Down Expand Up @@ -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>