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
ad3a6e15
You need to sign in or sign up before continuing.
Commit
ad3a6e15
authored
Jan 31, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: rtl list bullet symbol
parent
1914d405
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
app.scss
client/themes/default/scss/app.scss
+7
-2
common.js
server/controllers/common.js
+4
-4
No files found.
client/themes/default/scss/app.scss
View file @
ad3a6e15
...
@@ -480,9 +480,9 @@ ul {
...
@@ -480,9 +480,9 @@ ul {
color
:
mc
(
'grey'
,
'600'
);
color
:
mc
(
'grey'
,
'600'
);
display
:
inline-block
;
display
:
inline-block
;
width
:
1
.35rem
;
width
:
1
.35rem
;
@at-root
.is-rtl
&
{
@at-root
.is-rtl
&
{
content
:
'\25C
0
'
;
content
:
'\25C
3
'
;
}
}
}
}
>
li
{
>
li
{
...
@@ -645,6 +645,11 @@ ul {
...
@@ -645,6 +645,11 @@ ul {
right
:
1rem
;
right
:
1rem
;
height
:
calc
(
90px
-
32px
);
height
:
calc
(
90px
-
32px
);
width
:
auto
;
width
:
auto
;
@at-root
.is-rtl
&
{
left
:
1rem
;
right
:
initial
;
}
}
}
&
.decor-shadow
{
&
.decor-shadow
{
box-shadow
:
0
3px
8px
0
rgba
(
116
,
129
,
141
,
0
.1
);
box-shadow
:
0
3px
8px
0
rgba
(
116
,
129
,
141
,
0
.1
);
...
...
server/controllers/common.js
View file @
ad3a6e15
...
@@ -47,7 +47,7 @@ router.get(['/e', '/e/*'], async (req, res, next) => {
...
@@ -47,7 +47,7 @@ router.get(['/e', '/e/*'], async (req, res, next) => {
}
}
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
())
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
()
===
'rtl'
)
if
(
pageHelper
.
isReservedPath
(
pageArgs
.
path
))
{
if
(
pageHelper
.
isReservedPath
(
pageArgs
.
path
))
{
return
next
(
new
Error
(
'Cannot create this page because it starts with a system reserved path.'
))
return
next
(
new
Error
(
'Cannot create this page because it starts with a system reserved path.'
))
...
@@ -111,7 +111,7 @@ router.get(['/h', '/h/*'], async (req, res, next) => {
...
@@ -111,7 +111,7 @@ router.get(['/h', '/h/*'], async (req, res, next) => {
}
}
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
())
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
()
===
'rtl'
)
const
page
=
await
WIKI
.
models
.
pages
.
getPageFromDb
({
const
page
=
await
WIKI
.
models
.
pages
.
getPageFromDb
({
path
:
pageArgs
.
path
,
path
:
pageArgs
.
path
,
...
@@ -197,7 +197,7 @@ router.get(['/s', '/s/*'], async (req, res, next) => {
...
@@ -197,7 +197,7 @@ router.get(['/s', '/s/*'], async (req, res, next) => {
}
}
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
())
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
()
===
'rtl'
)
if
(
!
WIKI
.
auth
.
checkAccess
(
req
.
user
,
[
'read:source'
],
pageArgs
))
{
if
(
!
WIKI
.
auth
.
checkAccess
(
req
.
user
,
[
'read:source'
],
pageArgs
))
{
return
res
.
render
(
'unauthorized'
,
{
action
:
'source'
})
return
res
.
render
(
'unauthorized'
,
{
action
:
'source'
})
...
@@ -255,7 +255,7 @@ router.get('/*', async (req, res, next) => {
...
@@ -255,7 +255,7 @@ router.get('/*', async (req, res, next) => {
}
}
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.lang'
,
pageArgs
.
locale
)
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
())
_
.
set
(
res
,
'locals.siteConfig.rtl'
,
req
.
i18n
.
dir
()
===
'rtl'
)
if
(
page
)
{
if
(
page
)
{
_
.
set
(
res
.
locals
,
'pageMeta.title'
,
page
.
title
)
_
.
set
(
res
.
locals
,
'pageMeta.title'
,
page
.
title
)
...
...
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