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
You need to sign in or sign up before continuing.
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 @@
...
@@ -12,7 +12,7 @@
)
)
transition(name='fadeUp')
transition(name='fadeUp')
v-card.elevation-5(v-show='isShown', light)
v-card.elevation-5(v-show='isShown', light)
v-toolbar(color='
primary
', flat, dense, dark)
v-toolbar(color='
indigo
', flat, dense, dark)
v-spacer
v-spacer
.subheading(v-if='screen === "tfa"')
{{
$t
(
'auth:tfa.subtitle'
)
}}
.subheading(v-if='screen === "tfa"')
{{
$t
(
'auth:tfa.subtitle'
)
}}
.subheading(v-if='screen === "changePwd"')
{{
$t
(
'auth:changePwd.subtitle'
)
}}
.subheading(v-if='screen === "changePwd"')
{{
$t
(
'auth:changePwd.subtitle'
)
}}
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.
subheading
(
v
-
else
)
{{
$t
(
'auth:loginRequired'
)
}}
.
subheading
(
v
-
else
)
{{
$t
(
'auth:loginRequired'
)
}}
v
-
spacer
v
-
spacer
v
-
card
-
text
.
text
-
center
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"'
)
template
(
v
-
if
=
'screen === "login"'
)
v
-
text
-
field
.
mt
-
3
(
v
-
text
-
field
.
mt
-
3
(
solo
solo
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
max
-
width
=
'250px'
max
-
width
=
'250px'
v
-
if
=
'screen === "login"'
v
-
if
=
'screen === "login"'
large
large
color
=
'
teal
'
color
=
'
primary
'
dark
dark
@
click
=
'login'
@
click
=
'login'
rounded
rounded
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
max
-
width
=
'250px'
max
-
width
=
'250px'
v
-
else
-
if
=
'screen === "tfa"'
v
-
else
-
if
=
'screen === "tfa"'
large
large
color
=
'
teal
'
color
=
'
primary
'
dark
dark
@
click
=
'verifySecurityCode'
@
click
=
'verifySecurityCode'
rounded
rounded
...
@@ -121,7 +121,7 @@
...
@@ -121,7 +121,7 @@
max
-
width
=
'250px'
max
-
width
=
'250px'
v
-
else
-
if
=
'screen === "changePwd"'
v
-
else
-
if
=
'screen === "changePwd"'
large
large
color
=
'
teal
'
color
=
'
primary
'
dark
dark
@
click
=
'changePassword'
@
click
=
'changePassword'
rounded
rounded
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
max
-
width
=
'250px'
max
-
width
=
'250px'
v
-
else
-
if
=
'screen === "forgot"'
v
-
else
-
if
=
'screen === "forgot"'
large
large
color
=
'
teal
'
color
=
'
primary
'
dark
dark
@
click
=
'forgotPasswordSubmit'
@
click
=
'forgotPasswordSubmit'
rounded
rounded
...
@@ -170,7 +170,7 @@
...
@@ -170,7 +170,7 @@
v
-
spacer
v
-
spacer
loader
(
v
-
model
=
'isLoading'
,
:
color
=
'loaderColor'
,
:
title
=
'loaderTitle'
,
:
subtitle
=
'$t(`auth:pleaseWait`)'
)
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
notify
<
/template
>
<
/template
>
...
@@ -427,7 +427,7 @@ export default {
...
@@ -427,7 +427,7 @@ export default {
<
style
lang
=
"scss"
>
<
style
lang
=
"scss"
>
.
login
{
.
login
{
background
-
color
:
mc
(
'
grey
'
,
'900'
);
background
-
color
:
mc
(
'
indigo
'
,
'900'
);
background
-
image
:
url
(
'../static/svg/motif-blocks.svg'
);
background
-
image
:
url
(
'../static/svg/motif-blocks.svg'
);
background
-
repeat
:
repeat
;
background
-
repeat
:
repeat
;
background
-
size
:
200
px
;
background
-
size
:
200
px
;
...
@@ -437,10 +437,10 @@ export default {
...
@@ -437,10 +437,10 @@ export default {
@
include
keyframes
(
loginBgReveal
)
{
@
include
keyframes
(
loginBgReveal
)
{
0
%
{
0
%
{
background
-
position
-
x
:
0
;
background
-
position
-
y
:
0
;
}
}
100
%
{
100
%
{
background
-
position
-
x
:
800
px
;
background
-
position
-
y
:
800
px
;
}
}
}
}
...
...
client/components/register.vue
View file @
06c2e6e8
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
v-spacer
v-spacer
.subheading
{{
$t
(
'auth:registerTitle'
)
}}
.subheading
{{
$t
(
'auth:registerTitle'
)
}}
v-spacer
v-spacer
v-card-text.text-
xs-
center
v-card-text.text-center
h1.display-1.indigo--text.py-2
{{
siteTitle
}}
h1.display-1.indigo--text.py-2
{{
siteTitle
}}
.body-2
{{
$t
(
'auth:registerSubTitle'
)
}}
.body-2
{{
$t
(
'auth:registerSubTitle'
)
}}
v-text-field.md2.mt-3(
v-text-field.md2.mt-3(
solo
solo
flat
flat
prepend-icon='email'
prepend-icon='
mdi-
email'
background-color='grey lighten-4'
background-color='grey lighten-4'
hide-details
hide-details
ref='iptEmail'
ref='iptEmail'
...
@@ -33,11 +33,11 @@
...
@@ -33,11 +33,11 @@
v-text-field.md2.mt-2(
v-text-field.md2.mt-2(
solo
solo
flat
flat
prepend-icon='
vpn_key
'
prepend-icon='
mdi-textbox-password
'
background-color='grey lighten-4'
background-color='grey lighten-4'
ref='iptPassword'
ref='iptPassword'
v-model='password'
v-model='password'
:append-icon='hidePassword ? "
visibility" : "visibility_off
"'
:append-icon='hidePassword ? "
mdi-eye-off" : "mdi-eye
"'
@click:append='() => (hidePassword = !hidePassword)'
@click:append='() => (hidePassword = !hidePassword)'
:type='hidePassword ? "password" : "text"'
:type='hidePassword ? "password" : "text"'
:placeholder='$t("auth:fields.password")'
:placeholder='$t("auth:fields.password")'
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
v-text-field.md2.mt-2(
v-text-field.md2.mt-2(
solo
solo
flat
flat
prepend-icon='
vpn_key
'
prepend-icon='
mdi-textbox-password
'
background-color='grey lighten-4'
background-color='grey lighten-4'
hide-details
hide-details
ref='iptVerifyPassword'
ref='iptVerifyPassword'
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
v-text-field.md2.mt-2(
v-text-field.md2.mt-2(
solo
solo
flat
flat
prepend-icon='
person
'
prepend-icon='
mdi-account
'
background-color='grey lighten-4'
background-color='grey lighten-4'
ref='iptName'
ref='iptName'
v-model='name'
v-model='name'
...
@@ -74,12 +74,13 @@
...
@@ -74,12 +74,13 @@
v-card-actions.pb-4
v-card-actions.pb-4
v-spacer
v-spacer
v-btn.md2(
v-btn.md2(
block
width='100%'
max-width='250px'
large
large
dark
dark
color='indigo'
color='indigo'
@click='register'
@click='register'
round
round
ed
:loading='isLoading'
:loading='isLoading'
)
{{
$t
(
'auth:actions.register'
)
}}
)
{{
$t
(
'auth:actions.register'
)
}}
v-spacer
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