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
14c842ff
You need to sign in or sign up before continuing.
Commit
14c842ff
authored
Dec 22, 2019
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: rtl offset + list indent (#1326, #1327)
parent
f09f1f4f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
65 additions
and
8 deletions
+65
-8
nav-header.vue
client/components/common/nav-header.vue
+1
-1
editor-markdown.vue
client/components/editor/editor-markdown.vue
+4
-1
page.vue
client/themes/default/components/page.vue
+2
-2
app.scss
client/themes/default/scss/app.scss
+58
-4
No files found.
client/components/common/nav-header.vue
View file @
14c842ff
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
)
)
v-layout(row)
v-layout(row)
v-flex(xs6, md4)
v-flex(xs6, md4)
v-toolbar.nav-header-inner
.pl-3(color='black', dark, flat
)
v-toolbar.nav-header-inner
(color='black', dark, flat, :class='$vuetify.rtl ? `pr-3` : `pl-3`'
)
v-avatar(tile, size='34', @click='goHome')
v-avatar(tile, size='34', @click='goHome')
v-img.org-logo(:src='logoUrl')
v-img.org-logo(:src='logoUrl')
//- v-menu(open-on-hover, offset-y, bottom, left, min-width='250', transition='slide-y-transition')
//- v-menu(open-on-hover, offset-y, bottom, left, min-width='250', transition='slide-y-transition')
...
...
client/components/editor/editor-markdown.vue
View file @
14c842ff
...
@@ -183,6 +183,8 @@ import _ from 'lodash'
...
@@ -183,6 +183,8 @@ import _ from 'lodash'
import
{
get
,
sync
}
from
'vuex-pathify'
import
{
get
,
sync
}
from
'vuex-pathify'
import
markdownHelp
from
'./markdown/help.vue'
import
markdownHelp
from
'./markdown/help.vue'
/* global siteConfig */
// ========================================
// ========================================
// IMPORTS
// IMPORTS
// ========================================
// ========================================
...
@@ -491,7 +493,8 @@ export default {
...
@@ -491,7 +493,8 @@ export default {
}
,
}
,
viewportMargin: 50,
viewportMargin: 50,
inputStyle: 'contenteditable',
inputStyle: 'contenteditable',
allowDropFileTypes: ['image/jpg', 'image/png', 'image/svg', 'image/jpeg', 'image/gif']
allowDropFileTypes: ['image/jpg', 'image/png', 'image/svg', 'image/jpeg', 'image/gif'],
direction: siteConfig.rtl ? 'rtl' : 'ltr'
}
)
}
)
this.cm.setValue(this.$store.get('editor/content'))
this.cm.setValue(this.$store.get('editor/content'))
this.cm.on('change', c => {
this.cm.on('change', c => {
...
...
client/themes/default/components/page.vue
View file @
14c842ff
<
template
lang=
"pug"
>
<
template
lang=
"pug"
>
v-app(v-scroll='upBtnScroll', :dark='darkMode')
v-app(v-scroll='upBtnScroll', :dark='darkMode'
, :class='$vuetify.rtl ? `is-rtl` : `is-ltr`'
)
nav-header
nav-header
v-navigation-drawer(
v-navigation-drawer(
:class='darkMode ? `grey darken-4-d4` : `primary`'
:class='darkMode ? `grey darken-4-d4` : `primary`'
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
v-divider
v-divider
v-container.grey.pa-0(fluid, :class='darkMode ? `darken-4-l3` : `lighten-4`')
v-container.grey.pa-0(fluid, :class='darkMode ? `darken-4-l3` : `lighten-4`')
v-row(no-gutters, align-content='center', style='height: 90px;')
v-row(no-gutters, align-content='center', style='height: 90px;')
v-col.p
l-4.page-col-content(offset-xl='2', offset-lg='3', style='margin-top: auto; margin-bottom: auto;
')
v-col.p
age-col-content.is-page-header(offset-xl='2', offset-lg='3', style='margin-top: auto; margin-bottom: auto;', :class='$vuetify.rtl ? `pr-4` : `pl-4`
')
.headline.grey--text(:class='darkMode ? `text--lighten-2` : `text--darken-3`')
{{
title
}}
.headline.grey--text(:class='darkMode ? `text--lighten-2` : `text--darken-3`')
{{
title
}}
.caption.grey--text.text--darken-1
{{
description
}}
.caption.grey--text.text--darken-1
{{
description
}}
v-divider
v-divider
...
...
client/themes/default/scss/app.scss
View file @
14c842ff
...
@@ -103,10 +103,10 @@
...
@@ -103,10 +103,10 @@
background
:
linear-gradient
(
to
right
,
mc
(
'blue'
,
'300'
)
0%
,
mc
(
'blue'
,
'500'
)
10%
,
rgba
(
mc
(
'blue'
,
'900'
)
,
0
)
100%
);
background
:
linear-gradient
(
to
right
,
mc
(
'blue'
,
'300'
)
0%
,
mc
(
'blue'
,
'500'
)
10%
,
rgba
(
mc
(
'blue'
,
'900'
)
,
0
)
100%
);
}
}
@at-root
.
application--
is-rtl
&
{
@at-root
.is-rtl
&
{
background
:
linear-gradient
(
to
left
,
mc
(
'theme'
,
'primary'
)
,
rgba
(
mc
(
'theme'
,
'primary'
)
,
0
));
background
:
linear-gradient
(
to
left
,
mc
(
'theme'
,
'primary'
)
,
rgba
(
mc
(
'theme'
,
'primary'
)
,
0
));
}
}
@at-root
.theme--dark.
application--
is-rtl
&
{
@at-root
.theme--dark.is-rtl
&
{
background
:
linear-gradient
(
to
left
,
mc
(
'grey'
,
'600'
)
,
rgba
(
mc
(
'grey'
,
'600'
)
,
0
));
background
:
linear-gradient
(
to
left
,
mc
(
'grey'
,
'600'
)
,
rgba
(
mc
(
'grey'
,
'600'
)
,
0
));
}
}
}
}
...
@@ -133,10 +133,10 @@
...
@@ -133,10 +133,10 @@
background
:
linear-gradient
(
to
right
,
mc
(
'grey'
,
'300'
)
,
rgba
(
mc
(
'grey'
,
'700'
)
,
0
));
background
:
linear-gradient
(
to
right
,
mc
(
'grey'
,
'300'
)
,
rgba
(
mc
(
'grey'
,
'700'
)
,
0
));
}
}
@at-root
.
application--
is-rtl
&
{
@at-root
.is-rtl
&
{
background
:
linear-gradient
(
to
left
,
mc
(
'grey'
,
'700'
)
,
rgba
(
mc
(
'grey'
,
'700'
)
,
0
));
background
:
linear-gradient
(
to
left
,
mc
(
'grey'
,
'700'
)
,
rgba
(
mc
(
'grey'
,
'700'
)
,
0
));
}
}
@at-root
.theme--dark.
application--
is-rtl
&
{
@at-root
.theme--dark.is-rtl
&
{
background
:
linear-gradient
(
to
left
,
mc
(
'grey'
,
'300'
)
,
rgba
(
mc
(
'grey'
,
'700'
)
,
0
));
background
:
linear-gradient
(
to
left
,
mc
(
'grey'
,
'300'
)
,
rgba
(
mc
(
'grey'
,
'700'
)
,
0
));
}
}
}
}
...
@@ -315,9 +315,19 @@
...
@@ -315,9 +315,19 @@
padding
:
1rem
0
0
1rem
;
padding
:
1rem
0
0
1rem
;
list-style-position
:
outside
;
list-style-position
:
outside
;
@at-root
.is-rtl
&
{
padding-left
:
0
;
padding-right
:
1rem
;
}
li
>
ul
,
li
>
ol
{
li
>
ul
,
li
>
ol
{
padding-top
:
.5rem
;
padding-top
:
.5rem
;
padding-left
:
1rem
;
padding-left
:
1rem
;
@at-root
.is-rtl
&
{
padding-left
:
0
;
padding-right
:
1rem
;
}
}
}
li
+
li
{
li
+
li
{
...
@@ -328,6 +338,10 @@
...
@@ -328,6 +338,10 @@
padding-left
:
0
;
padding-left
:
0
;
list-style-type
:
none
;
list-style-type
:
none
;
@at-root
.is-rtl
&
{
padding-right
:
0
;
}
li
{
li
{
background-color
:
mc
(
'grey'
,
'50'
);
background-color
:
mc
(
'grey'
,
'50'
);
background-image
:
linear-gradient
(
to
bottom
,
#FFF
,
mc
(
'grey'
,
'50'
));
background-image
:
linear-gradient
(
to
bottom
,
#FFF
,
mc
(
'grey'
,
'50'
));
...
@@ -339,10 +353,20 @@
...
@@ -339,10 +353,20 @@
border-radius
:
5px
;
border-radius
:
5px
;
font-weight
:
500
;
font-weight
:
500
;
@at-root
.is-rtl
&
{
border-left-width
:
1px
;
border-right-width
:
5px
;
}
&
:hover
{
&
:hover
{
background-image
:
linear-gradient
(
to
bottom
,
#FFF
,
lighten
(
mc
(
'blue'
,
'50'
)
,
4%
));
background-image
:
linear-gradient
(
to
bottom
,
#FFF
,
lighten
(
mc
(
'blue'
,
'50'
)
,
4%
));
border-left-color
:
mc
(
'blue'
,
'500'
);
border-left-color
:
mc
(
'blue'
,
'500'
);
cursor
:
pointer
;
cursor
:
pointer
;
@at-root
.is-rtl
&
{
border-left-color
:
mc
(
'grey'
,
'200'
);
border-right-width
:
mc
(
'blue'
,
'500'
);
}
}
}
&
:
:
before
{
&
:
:
before
{
...
@@ -387,10 +411,20 @@
...
@@ -387,10 +411,20 @@
border-left
:
5px
solid
mc
(
'grey'
,
'700'
);
border-left
:
5px
solid
mc
(
'grey'
,
'700'
);
box-shadow
:
0
3px
8px
0
rgba
(
0
,
0
,
0
,
0
.1
);
box-shadow
:
0
3px
8px
0
rgba
(
0
,
0
,
0
,
0
.1
);
@at-root
.theme--dark.is-rtl
&
{
border-left-width
:
1px
;
border-right-width
:
5px
;
}
&
:hover
{
&
:hover
{
background-image
:
linear-gradient
(
to
bottom
,
lighten
(
mc
(
'grey'
,
'900'
)
,
2%
)
,
darken
(
mc
(
'grey'
,
'900'
)
,
3%
));
background-image
:
linear-gradient
(
to
bottom
,
lighten
(
mc
(
'grey'
,
'900'
)
,
2%
)
,
darken
(
mc
(
'grey'
,
'900'
)
,
3%
));
border-left-color
:
mc
(
'indigo'
,
'300'
);
border-left-color
:
mc
(
'indigo'
,
'300'
);
cursor
:
pointer
;
cursor
:
pointer
;
@at-root
.theme--dark.is-rtl
&
{
border-left-color
:
mc
(
'grey'
,
'900'
);
border-right-width
:
mc
(
'indigo'
,
'300'
);
}
}
}
}
}
}
}
...
@@ -711,6 +745,26 @@
...
@@ -711,6 +745,26 @@
}
}
// ---------------
// ---------------
// RTL FIXES
// Vuetify GH Issue: https://github.com/vuetifyjs/vuetify/issues/6317
// ---------------
.is-rtl
{
.page-col-content.is-page-header
{
@each
$size
,
$width
in
$grid-breakpoints
{
@media
(
min-width
:
$width
)
{
@for
$n
from
0
through
12
{
&
.offset-
#{
$size
}
-
#{
$n
}
{
margin-left
:
0
;
margin-right
:
(
$n
/
12
*
100
)
*
1%
;
}
}
}
}
}
}
// ---------------
// PRINT OVERRIDES
// PRINT OVERRIDES
// ---------------
// ---------------
...
...
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