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
247d598e
Commit
247d598e
authored
Jun 26, 2017
by
NGPixel
Committed by
Nicolas Giard
Jul 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: Color Themes - Header + Sidebar + Footer support
parent
c863059a
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
107 additions
and
10 deletions
+107
-10
source-view.component.js
client/js/pages/source-view.component.js
+1
-3
footer.scss
client/scss/components/footer.scss
+7
-0
nav.scss
client/scss/components/nav.scss
+38
-4
sidebar.scss
client/scss/components/sidebar.scss
+51
-0
data.yml
server/app/data.yml
+7
-0
footer.pug
server/views/common/footer.pug
+1
-1
header.pug
server/views/common/header.pug
+1
-1
layout.pug
server/views/layout.pug
+1
-1
No files found.
client/js/pages/source-view.component.js
View file @
247d598e
'use strict'
/* global siteRoot */
export
default
{
name
:
'source-view'
,
data
()
{
...
...
@@ -9,7 +7,7 @@ export default {
},
mounted
()
{
let
self
=
this
FuseBox
.
import
(
siteRoot
+
'/js/ace/ace.js'
,
(
ace
)
=>
{
FuseBox
.
import
(
'/js/ace/ace.js'
,
(
ace
)
=>
{
let
scEditor
=
ace
.
edit
(
'source-display'
)
scEditor
.
setTheme
(
'ace/theme/dawn'
)
scEditor
.
getSession
().
setMode
(
'ace/mode/markdown'
)
...
...
client/scss/components/footer.scss
View file @
247d598e
...
...
@@ -27,4 +27,11 @@
}
@each
$color
,
$colorvalue
in
$material-colors
{
&
.is-
#{
$color
}
{
background-color
:
mc
(
$color
,
'50'
);
color
:
mc
(
$color
,
'500'
);
}
}
}
client/scss/components/nav.scss
View file @
247d598e
...
...
@@ -10,25 +10,37 @@
z-index
:
2
;
color
:
#FFF
;
/* THEME OVERRIDE - START */
@each
$color
,
$colorvalue
in
$material-colors
{
&
.is-
#{
$color
}
{
background-color
:
mc
(
$color
,
'500'
);
box-shadow
:
0
2px
3px
rgba
(
mc
(
$color
,
'500'
)
,
0
.2
);
.nav-item
a
,
a
.nav-item
{
color
:
mc
(
$color
,
'50'
);
&
:hover
{
color
:
mc
(
$color
,
'200'
);
}
}
h1
:hover
{
color
:
mc
(
$color
,
'100'
);
}
.nav-item
{
.button
{
border
:
1px
solid
mc
(
$color
,
'900'
);
background-color
:
mc
(
$color
,
'800'
);
&
.is-outlined
{
background-color
:
mc
(
$color
,
'600'
);
border-color
:
mc
(
$color
,
'800'
);
color
:
mc
(
$color
,
'100'
);
}
&
:hover
{
border-color
:
mc
(
$color
,
'900'
);
background-color
:
mc
(
$color
,
'900'
);
}
...
...
@@ -36,9 +48,31 @@
}
.control
{
input
[
type
=
text
]
{
background-color
:
mc
(
$color
,
'800'
);
border-color
:
mc
(
$color
,
'400'
);
color
:
mc
(
$color
,
'50'
);
&
:focus
{
border-color
:
mc
(
$color
,
'200'
);
box-shadow
:
inset
0
0
5px
0
rgba
(
mc
(
$color
,
'900'
)
,
0
.5
);
}
@include
placeholder
{
color
:
mc
(
$color
,
'200'
);
}
}
}
}
}
/* THEME OVERRIDE - END */
}
.nav-left
{
...
...
@@ -117,7 +151,7 @@
}
&
:hover
{
color
:
mc
(
'indigo'
,
'100'
);
color
:
mc
(
$primary
,
'100'
);
}
}
...
...
client/scss/components/sidebar.scss
View file @
247d598e
...
...
@@ -135,3 +135,54 @@
}
}
/* THEME OVERRIDE - START */
@each
$color
,
$colorvalue
in
$material-colors
{
.is-alternate-
#{
$color
}
.sidebar
{
background-color
:
mc
(
$color
,
'900'
);
color
:
mc
(
$color
,
'50'
);
aside
{
.sidebar-label
{
color
:
mc
(
$color
,
'300'
);
background-color
:
mc
(
$color
,
'800'
);
}
.sidebar-menu
{
li
{
a
{
color
:
mc
(
$color
,
'50'
);
&
.is-active
{
border-left-color
:
mc
(
$color
,
'500'
);
color
:
mc
(
$color
,
'300'
);
.is-small
{
color
:
mc
(
$color
,
'500'
);
}
}
&
:hover
{
color
:
mc
(
$color
,
'400'
);
}
i
{
color
:
mc
(
$color
,
'300'
);
}
}
>
ul
{
border-top-color
:
lighten
(
mc
(
$color
,
'900'
)
,
3%
);
border-bottom-color
:
lighten
(
mc
(
$color
,
'900'
)
,
2%
);
background-color
:
darken
(
mc
(
$color
,
'900'
)
,
2%
);
li
a
{
color
:
mc
(
$color
,
'100'
);
}
}
}
}
}
}
}
/* THEME OVERRIDE - END */
server/app/data.yml
View file @
247d598e
...
...
@@ -57,6 +57,13 @@ defaults:
papertrail
:
false
rollbar
:
false
sentry
:
false
theme
:
primary
:
indigo
alt
:
blue-grey
footer
:
blue-grey
code
:
dark
:
true
colorize
:
true
langs
:
-
id
:
en
...
...
server/views/common/footer.pug
View file @
247d598e
footer.footer
footer.footer
(class=['is-' + appconfig.theme.footer])
span
= t('footer.poweredby') + ' '
a(href='https://github.com/Requarks/wiki') Wiki.js
...
...
server/views/common/header.pug
View file @
247d598e
#header-container
nav.nav#header
nav.nav#header
(class=['is-' + appconfig.theme.primary])
.nav-left
block rootNavLeft
a.nav-item(href='/')
...
...
server/views/layout.pug
View file @
247d598e
...
...
@@ -29,7 +29,7 @@ html
block head
body
#root.has-stickynav
#root.has-stickynav
(class=['is-primary-' + appconfig.theme.primary, 'is-alternate-' + appconfig.theme.alt])
include ./common/header.pug
alert
main
...
...
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