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
9b8a8867
Commit
9b8a8867
authored
Apr 22, 2019
by
Nick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: nav notify positioning + timeout indicator
parent
d7676513
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
77 additions
and
27 deletions
+77
-27
client-app.js
client/client-app.js
+1
-0
admin.vue
client/components/admin.vue
+1
-0
nav-header.vue
client/components/common/nav-header.vue
+2
-0
notify.vue
client/components/common/notify.vue
+58
-0
page-delete.vue
client/components/common/page-delete.vue
+8
-0
editor.vue
client/components/editor.vue
+1
-12
history.vue
client/components/history.vue
+1
-0
login.vue
client/components/login.vue
+1
-0
profile.vue
client/components/profile.vue
+1
-0
register.vue
client/components/register.vue
+1
-0
source.vue
client/components/source.vue
+1
-0
base.scss
client/scss/base/base.scss
+0
-2
nav-footer.vue
client/themes/default/components/nav-footer.vue
+0
-13
page.vue
client/themes/default/components/page.vue
+1
-0
No files found.
client/client-app.js
View file @
9b8a8867
...
...
@@ -207,6 +207,7 @@ Vue.component('page-source', () => import(/* webpackChunkName: "source" */ './co
Vue
.
component
(
'loader'
,
()
=>
import
(
/* webpackPrefetch: true, webpackChunkName: "ui-extra" */
'./components/common/loader.vue'
))
Vue
.
component
(
'login'
,
()
=>
import
(
/* webpackPrefetch: true, webpackChunkName: "login" */
'./components/login.vue'
))
Vue
.
component
(
'nav-header'
,
()
=>
import
(
/* webpackMode: "eager" */
'./components/common/nav-header.vue'
))
Vue
.
component
(
'notify'
,
()
=>
import
(
/* webpackMode: "eager" */
'./components/common/notify.vue'
))
Vue
.
component
(
'page-selector'
,
()
=>
import
(
/* webpackPrefetch: true, webpackChunkName: "ui-extra" */
'./components/common/page-selector.vue'
))
Vue
.
component
(
'profile'
,
()
=>
import
(
/* webpackChunkName: "profile" */
'./components/profile.vue'
))
Vue
.
component
(
'register'
,
()
=>
import
(
/* webpackChunkName: "register" */
'./components/register.vue'
))
...
...
client/components/admin.vue
View file @
9b8a8867
...
...
@@ -104,6 +104,7 @@
router-view
nav-footer
notify
search-results
</
template
>
...
...
client/components/common/nav-header.vue
View file @
9b8a8867
...
...
@@ -321,6 +321,8 @@ export default {
<
style
lang=
'scss'
>
.nav-header
{
z-index
:
1000
;
.v-toolbar__extension
{
padding
:
0
;
...
...
client/components/common/notify.vue
0 → 100644
View file @
9b8a8867
<
template
lang=
'pug'
>
v-snackbar.nav-notify(
:color='notification.style'
top
multi-line
auto-height
v-model='notificationState'
)
.text-xs-left
v-icon.mr-3(dark)
{{
notification
.
icon
}}
span
{{
notification
.
message
}}
</
template
>
<
script
>
import
{
get
,
sync
}
from
'vuex-pathify'
export
default
{
data
()
{
return
{
}
},
computed
:
{
notification
:
get
(
'notification'
),
notificationState
:
sync
(
'notification@isActive'
)
}
}
</
script
>
<
style
lang=
'scss'
>
.nav-notify
{
top
:
60px
;
z-index
:
999
;
.v-snack__content
{
position
:
relative
;
&
:
:
after
{
content
:
''
;
display
:
block
;
width
:
100%
;
height
:
2px
;
background-color
:
rgba
(
255
,
255
,
255
,.
4
);
position
:
absolute
;
bottom
:
0
;
left
:
0
;
animation
:
nav-notify-anim
6s
linear
;
}
}
}
@keyframes
nav-notify-anim
{
0
%
{
width
:
100%
;
}
100
%
{
width
:
0%
;
}
}
</
style
>
client/components/common/page-delete.vue
View file @
9b8a8867
...
...
@@ -92,17 +92,25 @@ export default {
<
style
lang=
'scss'
>
body
.page-deleted-pending
{
perspective
:
50vw
;
height
:
100vh
;
overflow
:
hidden
;
.application
{
background-color
:
mc
(
'grey'
,
'900'
);
}
.application--wrap
{
transform-style
:
preserve-3d
;
transform
:
translateZ
(
-5vw
)
rotateX
(
2deg
);
border-radius
:
7px
;
overflow
:
hidden
;
}
}
body
.page-deleted
{
perspective
:
50vw
;
.application--wrap
{
transform-style
:
preserve-3d
;
transform
:
translateZ
(
-1000vw
)
rotateX
(
60deg
);
opacity
:
0
;
}
...
...
client/components/editor.vue
View file @
9b8a8867
...
...
@@ -39,16 +39,7 @@
component(:is='activeModal')
loader(v-model='dialogProgress', :title='$t(`editor:save.processing`)', :subtitle='$t(`editor:save.pleaseWait`)')
v-snackbar(
:color='notification.style'
bottom,
right,
multi-line,
v-model='notificationState'
)
.text-xs-left
v-icon.mr-3(dark)
{{
notification
.
icon
}}
span
{{
notification
.
message
}}
notify
</
template
>
<
script
>
...
...
@@ -134,8 +125,6 @@ export default {
darkMode
:
get
(
'site/dark'
),
activeModal
:
sync
(
'editor/activeModal'
),
mode
:
get
(
'editor/mode'
),
notification
:
get
(
'notification'
),
notificationState
:
sync
(
'notification@isActive'
),
welcomeMode
()
{
return
this
.
mode
===
`create`
&&
this
.
path
===
`home`
},
currentPageTitle
:
get
(
'page/title'
)
},
...
...
client/components/history.vue
View file @
9b8a8867
...
...
@@ -103,6 +103,7 @@
v-card.mt-3(light, v-html='diffHTML')
nav-footer
notify
search-results
</
template
>
...
...
client/components/login.vue
View file @
9b8a8867
...
...
@@ -130,6 +130,7 @@
loader
(
v
-
model
=
'isLoading'
,
:
color
=
'loaderColor'
,
:
title
=
'loaderTitle'
,
:
subtitle
=
'$t(`auth:pleaseWait`)'
)
nav
-
footer
(
color
=
'grey darken-4'
)
notify
<
/template
>
<
script
>
...
...
client/components/profile.vue
View file @
9b8a8867
...
...
@@ -23,6 +23,7 @@
router-view
nav-footer
notify
search-results
</
template
>
...
...
client/components/register.vue
View file @
9b8a8867
...
...
@@ -92,6 +92,7 @@
loader(v-model='isLoading', :mode='loaderMode', :icon='loaderIcon', :color='loaderColor', :title='loaderTitle', :subtitle='loaderSubtitle')
nav-footer(color='grey darken-4', dark-color='grey darken-4')
notify
</
template
>
<
script
>
...
...
client/components/source.vue
View file @
9b8a8867
...
...
@@ -16,6 +16,7 @@
slot
nav-footer
notify
search-results
</
template
>
...
...
client/scss/base/base.scss
View file @
9b8a8867
html
{
box-sizing
:
border-box
;
height
:
100%
;
perspective
:
50vw
;
background-color
:
mc
(
'grey'
,
'900'
);
}
*,
*
:before
,
*
:after
{
...
...
@@ -23,7 +22,6 @@ html {
.application--wrap
{
transition
:
all
1
.2s
ease
;
transform-style
:
preserve-3d
;
transform-origin
:
50%
50%
;
background-color
:
#FFF
;
...
...
client/themes/default/components/nav-footer.vue
View file @
9b8a8867
...
...
@@ -3,17 +3,6 @@
.caption.grey--text.text--darken-1
span(v-if='company && company.length > 0')
{{
$t
(
'common:footer.copyright'
,
{
company
:
company
,
year
:
currentYear
,
interpolation
:
{
escapeValue
:
false
}
}
)
}}
|&
nbsp
;
span
{{
$t
(
'common:footer.poweredBy'
)
}}
#
[
a
(
href
=
'https://wiki.js.org'
,
ref
=
'nofollow'
)
Wiki
.
js
]
v
-
snackbar
(
:
color
=
'notification.style'
bottom
right
multi
-
line
v
-
model
=
'notificationState'
)
.
text
-
xs
-
left
v
-
icon
.
mr
-
3
(
dark
)
{{
notification
.
icon
}}
span
{{
notification
.
message
}}
<
/template
>
<
script
>
...
...
@@ -37,9 +26,7 @@ export default {
}
,
computed
:
{
company
:
get
(
'site/company'
),
notification
:
get
(
'notification'
),
darkMode
:
get
(
'site/dark'
),
notificationState
:
sync
(
'notification@isActive'
),
bgColor
()
{
if
(
!
this
.
darkMode
)
{
return
this
.
color
...
...
client/themes/default/components/page.vue
View file @
9b8a8867
...
...
@@ -117,6 +117,7 @@
span Print Format
v-spacer
nav-footer
notify
search-results
v-fab-transition
v-btn(v-if='upBtnShown', fab, fixed, bottom, right, small, @click='$vuetify.goTo(0, scrollOpts)', color='primary')
...
...
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