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
00da4e3e
Commit
00da4e3e
authored
Jun 24, 2017
by
NGPixel
Committed by
Nicolas Giard
Jul 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: Color Theme page UI + color picker + toggle
parent
a1b6dfb3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
161 additions
and
11 deletions
+161
-11
CHANGELOG.md
CHANGELOG.md
+2
-0
app.js
client/js/app.js
+2
-0
color-picker.vue
client/js/components/color-picker.vue
+29
-3
toggle.vue
client/js/components/toggle.vue
+21
-0
app.scss
client/scss/app.scss
+2
-0
color-picker.scss
client/scss/components/color-picker.scss
+32
-0
toggle.scss
client/scss/components/toggle.scss
+53
-0
admin.json
server/locales/en/admin.json
+6
-0
theme.pug
server/views/pages/admin/theme.pug
+14
-8
No files found.
CHANGELOG.md
View file @
00da4e3e
...
...
@@ -4,10 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [v1.0.0-beta.13] - Unreleased
### Added
-
**Editor**
: Linebreaks are now rendered, can be disabled via config option
-
**History**
: History section to list all changes
-
**Security**
: Optional Two-Factor Authentication protection
### Changed
-
**Editor**
: TeX and MathML is now rendered server-side to SVG
-
**UI**
: Updated icons to Nucleo icon set
### Fixed
...
...
client/js/app.js
View file @
00da4e3e
...
...
@@ -75,6 +75,7 @@ import modalProfile2faComponent from './components/modal-profile-2fa.vue'
import
modalUpgradeSystemComponent
from
'./components/modal-upgrade-system.vue'
import
pageLoaderComponent
from
'./components/page-loader.vue'
import
searchComponent
from
'./components/search.vue'
import
toggleComponent
from
'./components/toggle.vue'
import
treeComponent
from
'./components/tree.vue'
import
adminEditUserComponent
from
'./pages/admin-edit-user.component.js'
...
...
@@ -189,6 +190,7 @@ $(() => {
pageLoader
:
pageLoaderComponent
,
search
:
searchComponent
,
sourceView
:
sourceViewComponent
,
toggle
:
toggleComponent
,
tree
:
treeComponent
},
store
,
...
...
client/js/components/color-picker.vue
View file @
00da4e3e
<
template
lang=
"pug"
>
p.control
input.input(type='text', placeholder='#F0F0F0', v-model='color
')
.colorpicker
.colorpicker-choice(v-for='color in colors', :class='["is-" + color, color === currentColor ? "is-active" : ""]', @click='setColor(color)
')
</
template
>
<
script
>
export
default
{
name
:
'color-picker'
,
props
:
[
'currentColor'
],
data
()
{
return
{
color
:
'000000'
colors
:
[
'red'
,
'pink'
,
'purple'
,
'deep-purple'
,
'indigo'
,
'blue'
,
'light-blue'
,
'cyan'
,
'teal'
,
'green'
,
'light-green'
,
'lime'
,
'yellow'
,
'amber'
,
'orange'
,
'deep-orange'
,
'brown'
,
'grey'
,
'blue-grey'
]
}
},
methods
:
{
setColor
(
color
)
{
this
.
currentColor
=
color
}
}
}
...
...
client/js/components/toggle.vue
0 → 100644
View file @
00da4e3e
<
template
lang=
"pug"
>
.toggle(:class='{ "is-active": currentValue }', @click='changeToggle')
.toggle-container
.toggle-pin
.toggle-text
{{
desc
}}
</
template
>
<
script
>
export
default
{
name
:
'toggle'
,
props
:
[
'currentValue'
,
'desc'
],
data
()
{
return
{
}
},
methods
:
{
changeToggle
()
{
this
.
currentValue
=
!
this
.
currentValue
}
}
}
</
script
>
client/scss/app.scss
View file @
00da4e3e
...
...
@@ -14,6 +14,7 @@ $primary: 'indigo';
@import
'components/alert'
;
@import
'components/button'
;
@import
'components/collapsable-nav'
;
@import
'components/color-picker'
;
@import
'components/footer'
;
@import
'components/form'
;
@import
'components/grid'
;
...
...
@@ -25,6 +26,7 @@ $primary: 'indigo';
@import
'components/search'
;
@import
'components/sidebar'
;
@import
'components/table'
;
@import
'components/toggle'
;
@import
'components/typography'
;
@import
'libs/nucleo-icons'
;
...
...
client/scss/components/color-picker.scss
0 → 100644
View file @
00da4e3e
.colorpicker
{
display
:
flex
;
align-items
:
center
;
height
:
60px
;
&
-choice
{
width
:
50px
;
height
:
50px
;
border
:
1px
solid
#FFF
;
transition
:
all
.2s
ease
;
cursor
:
pointer
;
&
.is-active
,
&
:hover
{
border-width
:
5px
;
width
:
60px
;
height
:
60px
;
}
@each
$color
,
$colorvalue
in
$material-colors
{
&
.is-
#{
$color
}
{
background-color
:
mc
(
$color
,
'500'
);
border-color
:
mc
(
$color
,
'500'
);
&
.is-active
,
&
:hover
{
border-color
:
mc
(
$color
,
'300'
);
}
}
}
}
}
client/scss/components/toggle.scss
0 → 100644
View file @
00da4e3e
.toggle
{
display
:
inline-flex
;
align-items
:
center
;
height
:
24px
;
cursor
:
pointer
;
margin
:
5px
5px
5px
0
;
&
+
&
{
margin-left
:
15px
;
}
&
-container
{
display
:
inline-flex
;
align-items
:
center
;
height
:
24px
;
width
:
50px
;
background-color
:
mc
(
'grey'
,
'300'
);
border-radius
:
12px
;
padding
:
2px
;
transition
:
background-color
.5s
ease
;
}
&
-pin
{
display
:
flex
;
background-color
:
#FFF
;
border-radius
:
10px
;
height
:
20px
;
width
:
20px
;
transition
:
all
.5s
ease
;
}
&
-text
{
padding-left
:
10px
;
color
:
mc
(
'grey'
,
'700'
);
font-size
:
12px
;
}
&
:hover
{
.toggle-container
{
background-color
:
mc
(
'grey'
,
'400'
);
}
}
&
.is-active
{
.toggle-container
{
background-color
:
mc
(
'indigo'
,
'500'
);
}
.toggle-pin
{
margin-left
:
28px
;
}
}
}
server/locales/en/admin.json
View file @
00da4e3e
...
...
@@ -42,6 +42,12 @@
"system"
:
{
"subtitle"
:
"Information on Wiki.js and troubleshooting tools"
},
"theme"
:
{
"subtitle"
:
"Customize the appearance of your wiki"
,
"primarycolor"
:
"Primary Color"
,
"altcolor"
:
"Secondary Color"
,
"codeblock"
:
"Code Blocks"
},
"users"
:
{
"createauthorize"
:
"Create / Authorize User"
,
"subtitle"
:
"Manage users and access rights"
,
...
...
server/views/pages/admin/theme.pug
View file @
00da4e3e
extends ./_layout.pug
block adminContent
#page-type-admin-settings
.hero
h1.title#title= t('nav.theme')
h2.subtitle= t('admin:theme.subtitle')
.form-sections
section
label.label= t('admin:theme.primarycolor')
color-picker
.hero
h1.title#title= t('nav.theme')
h2.subtitle= t('admin:theme.subtitle')
.form-sections
section
label.label= t('admin:theme.primarycolor')
color-picker(current-color='indigo')
section
label.label= t('admin:theme.altcolor')
color-picker(current-color='blue-grey')
section
label.label= t('admin:theme.codeblock')
toggle(current-value='dark', desc='Use Dark Theme')
toggle(current-value='dark', desc='Colorize code syntax')
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