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
b38655b9
Commit
b38655b9
authored
Jun 02, 2019
by
Nick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: links-list + page logo alignment
parent
f31f8358
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
66 additions
and
7 deletions
+66
-7
nav-header.vue
client/components/common/nav-header.vue
+36
-6
app.scss
client/themes/default/scss/app.scss
+30
-1
No files found.
client/components/common/nav-header.vue
View file @
b38655b9
...
...
@@ -19,7 +19,7 @@
v-layout(row)
v-flex(xs6, :md4='searchIsShown', :md6='!searchIsShown')
v-toolbar.nav-header-inner(color='black', dark, flat)
v-menu(open-on-hover, offset-y, bottom, left, min-width='250')
v-menu(open-on-hover, offset-y, bottom, left, min-width='250'
, transition='slide-y-transition'
)
v-toolbar-side-icon.btn-animate-app(slot='activator')
v-icon view_module
v-list(dense, :light='!$vuetify.dark', :dark='$vuetify.dark', :class='$vuetify.dark ? `grey darken-4` : ``').py-0
...
...
@@ -137,11 +137,22 @@
icon
)
v-icon(color='grey') search
//- v-menu(offset-y, left, transition='slide-y-transition')
//- v-tooltip(bottom, slot='activator')
//- v-btn(icon, slot='activator')
//- v-icon(color='grey') language
//- span Language
//- v-list.py-0
//- template(v-for='(lc, idx) of locales')
//- v-list-tile(@click='changeLocale(lc)')
//- v-list-tile-action: v-chip(:color='lc.code === $i18n.i18next.language ? `blue` : `grey`', small, label, dark)
{{
lc
.
code
.
toUpperCase
()
}}
//- v-list-tile-title
{{
lc
.
name
}}
//- v-divider.my-0(v-if='idx < locales.length - 1')
v-tooltip(bottom, v-if='isAuthenticated && isAdmin')
v-btn.btn-animate-rotate(icon, href='/a', slot='activator')
v-icon(color='grey') settings
span Admin
v-menu(v-if='isAuthenticated', offset-y, min-width='300', left)
v-menu(v-if='isAuthenticated', offset-y, min-width='300', left
, transition='slide-y-transition'
)
v-tooltip(bottom, slot='activator')
v-btn(icon, slot='activator', outline, color='blue')
v-icon(v-if='picture.kind === `initials`', color='grey') account_circle
...
...
@@ -159,11 +170,11 @@
v-list-tile-title
{{
name
}}
v-list-tile-sub-title
{{
email
}}
v-divider.my-0
v-list-tile(href='/w')
v-list-tile(href='/w'
, disabled
)
v-list-tile-action: v-icon(color='blue') web
v-list-tile-title My Wiki
v-divider.my-0
v-list-tile(href='/p')
v-list-tile(href='/p'
, disabled
)
v-list-tile-action: v-icon(color='blue') person
v-list-tile-title Profile
v-divider.my-0
...
...
@@ -205,7 +216,12 @@ export default {
searchIsShown
:
true
,
searchAdvMenuShown
:
false
,
newPageModal
:
false
,
deletePageModal
:
false
deletePageModal
:
false
,
locales
:
[
{
code
:
'en'
,
name
:
'English'
},
{
code
:
'fr'
,
name
:
'Français'
},
{
code
:
'es'
,
name
:
'Español'
}
]
}
},
computed
:
{
...
...
@@ -304,7 +320,21 @@ export default {
this
.
deletePageModal
=
true
},
assets
()
{
window
.
location
.
assign
(
`/f`
)
// window.location.assign(`/f`)
this
.
$store
.
commit
(
'showNotification'
,
{
style
:
'indigo'
,
message
:
`Coming soon...`
,
icon
:
'directions_boat'
})
},
async
changeLocale
(
locale
)
{
await
this
.
$i18n
.
i18next
.
changeLanguage
(
locale
.
code
)
switch
(
this
.
mode
)
{
case
'view'
:
case
'history'
:
window
.
location
.
assign
(
`/
${
locale
.
code
}
/
${
this
.
path
}
`
)
break
}
},
logout
()
{
Cookies
.
remove
(
'jwt'
)
...
...
client/themes/default/scss/app.scss
View file @
b38655b9
...
...
@@ -151,6 +151,11 @@
margin-right
:
.5rem
;
}
&
.valign-center
>
p
{
display
:
flex
;
align-items
:
center
;
}
&
.is-info
{
background-color
:
mc
(
'blue'
,
'50'
);
background-image
:
radial-gradient
(
ellipse
at
top
,
mc
(
'blue'
,
'50'
)
,
lighten
(
mc
(
'blue'
,
'50'
)
,
5%
));
...
...
@@ -265,6 +270,28 @@
text-decoration
:
none
;
margin
:
-1rem
;
padding
:
1rem
;
>
em
{
font-weight
:
400
;
font-style
:
normal
;
color
:
mc
(
'grey'
,
'700'
);
display
:
inline-block
;
padding-left
:
.5rem
;
border-left
:
1px
solid
mc
(
'grey'
,
'300'
);
margin-left
:
.5rem
;
&
.is-block
{
display
:
block
;
padding-left
:
0
;
margin-left
:
0
;
border-left
:
none
;
}
}
}
>
em
{
font-weight
:
400
;
font-style
:
normal
;
}
@at-root
.theme--dark
&
{
...
...
@@ -481,8 +508,10 @@
}
&
.align-abstopright
{
position
:
absolute
;
top
:
-
8
0px
;
top
:
-
9
0px
;
right
:
1rem
;
height
:
calc
(
90px
-
2rem
);
width
:
auto
;
}
&
.decor-shadow
{
box-shadow
:
0
3px
8px
0
rgba
(
116
,
129
,
141
,
0
.1
);
...
...
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