Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
06c2e6e8
Commit
06c2e6e8
authored
Aug 30, 2019
by
Nick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: missing mdi icons on registration dialog (#996)
parent
e5d7ea8c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
18 deletions
+19
-18
login.vue
client/components/login.vue
+10
-10
register.vue
client/components/register.vue
+9
-8
No files found.
client/components/login.vue
View file @
06c2e6e8
...
...
@@ -12,7 +12,7 @@
)
transition(name='fadeUp')
v-card.elevation-5(v-show='isShown', light)
v-toolbar(color='
primary
', flat, dense, dark)
v-toolbar(color='
indigo
', flat, dense, dark)
v-spacer
.subheading(v-if='screen === "tfa"')
{{
$t
(
'auth:tfa.subtitle'
)
}}
.subheading(v-if='screen === "changePwd"')
{{
$t
(
'auth:changePwd.subtitle'
)
}}
...
...
@@ -20,7 +20,7 @@
.
subheading
(
v
-
else
)
{{
$t
(
'auth:loginRequired'
)
}}
v
-
spacer
v
-
card
-
text
.
text
-
center
h1
.
display
-
1
.
primary
--
text
.
py
-
2
{{
siteTitle
}}
h1
.
display
-
1
.
indigo
--
text
.
py
-
2
{{
siteTitle
}}
template
(
v
-
if
=
'screen === "login"'
)
v
-
text
-
field
.
mt
-
3
(
solo
...
...
@@ -99,7 +99,7 @@
max
-
width
=
'250px'
v
-
if
=
'screen === "login"'
large
color
=
'
teal
'
color
=
'
primary
'
dark
@
click
=
'login'
rounded
...
...
@@ -110,7 +110,7 @@
max
-
width
=
'250px'
v
-
else
-
if
=
'screen === "tfa"'
large
color
=
'
teal
'
color
=
'
primary
'
dark
@
click
=
'verifySecurityCode'
rounded
...
...
@@ -121,7 +121,7 @@
max
-
width
=
'250px'
v
-
else
-
if
=
'screen === "changePwd"'
large
color
=
'
teal
'
color
=
'
primary
'
dark
@
click
=
'changePassword'
rounded
...
...
@@ -132,7 +132,7 @@
max
-
width
=
'250px'
v
-
else
-
if
=
'screen === "forgot"'
large
color
=
'
teal
'
color
=
'
primary
'
dark
@
click
=
'forgotPasswordSubmit'
rounded
...
...
@@ -170,7 +170,7 @@
v
-
spacer
loader
(
v
-
model
=
'isLoading'
,
:
color
=
'loaderColor'
,
:
title
=
'loaderTitle'
,
:
subtitle
=
'$t(`auth:pleaseWait`)'
)
nav
-
footer
(
color
=
'grey darken-
4
'
)
nav
-
footer
(
color
=
'grey darken-
5
'
)
notify
<
/template
>
...
...
@@ -427,7 +427,7 @@ export default {
<
style
lang
=
"scss"
>
.
login
{
background
-
color
:
mc
(
'
grey
'
,
'900'
);
background
-
color
:
mc
(
'
indigo
'
,
'900'
);
background
-
image
:
url
(
'../static/svg/motif-blocks.svg'
);
background
-
repeat
:
repeat
;
background
-
size
:
200
px
;
...
...
@@ -437,10 +437,10 @@ export default {
@
include
keyframes
(
loginBgReveal
)
{
0
%
{
background
-
position
-
x
:
0
;
background
-
position
-
y
:
0
;
}
100
%
{
background
-
position
-
x
:
800
px
;
background
-
position
-
y
:
800
px
;
}
}
...
...
client/components/register.vue
View file @
06c2e6e8
...
...
@@ -16,13 +16,13 @@
v-spacer
.subheading
{{
$t
(
'auth:registerTitle'
)
}}
v-spacer
v-card-text.text-
xs-
center
v-card-text.text-center
h1.display-1.indigo--text.py-2
{{
siteTitle
}}
.body-2
{{
$t
(
'auth:registerSubTitle'
)
}}
v-text-field.md2.mt-3(
solo
flat
prepend-icon='email'
prepend-icon='
mdi-
email'
background-color='grey lighten-4'
hide-details
ref='iptEmail'
...
...
@@ -33,11 +33,11 @@
v-text-field.md2.mt-2(
solo
flat
prepend-icon='
vpn_key
'
prepend-icon='
mdi-textbox-password
'
background-color='grey lighten-4'
ref='iptPassword'
v-model='password'
:append-icon='hidePassword ? "
visibility" : "visibility_off
"'
:append-icon='hidePassword ? "
mdi-eye-off" : "mdi-eye
"'
@click:append='() => (hidePassword = !hidePassword)'
:type='hidePassword ? "password" : "text"'
:placeholder='$t("auth:fields.password")'
...
...
@@ -49,7 +49,7 @@
v-text-field.md2.mt-2(
solo
flat
prepend-icon='
vpn_key
'
prepend-icon='
mdi-textbox-password
'
background-color='grey lighten-4'
hide-details
ref='iptVerifyPassword'
...
...
@@ -62,7 +62,7 @@
v-text-field.md2.mt-2(
solo
flat
prepend-icon='
person
'
prepend-icon='
mdi-account
'
background-color='grey lighten-4'
ref='iptName'
v-model='name'
...
...
@@ -74,12 +74,13 @@
v-card-actions.pb-4
v-spacer
v-btn.md2(
block
width='100%'
max-width='250px'
large
dark
color='indigo'
@click='register'
round
round
ed
:loading='isLoading'
)
{{
$t
(
'auth:actions.register'
)
}}
v-spacer
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment