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
2876b693
Commit
2876b693
authored
May 19, 2017
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: navbar offset in editor + editor UI changes
parent
44220f1d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
15 deletions
+25
-15
settings.json
.vscode/settings.json
+3
-2
app.js
client/js/app.js
+2
-1
_editor.scss
client/scss/components/_editor.scss
+18
-10
header.pug
server/views/common/header.pug
+1
-1
view.pug
server/views/pages/view.pug
+1
-1
No files found.
.vscode/settings.json
View file @
2876b693
{
{
"eslint.enable"
:
true
,
"eslint.enable"
:
true
,
"puglint.enable"
:
true
,
"puglint.enable"
:
true
,
"standard.enable"
:
false
"standard.enable"
:
false
,
"editor.formatOnSave"
:
true
}
}
client/js/app.js
View file @
2876b693
...
@@ -19,7 +19,8 @@ $(() => {
...
@@ -19,7 +19,8 @@ $(() => {
offset
:
-
50
offset
:
-
50
})
})
$
(
'.stickyscroll'
).
sticky
({
topSpacing
:
15
,
bottomSpacing
:
75
})
$
(
'#header'
).
sticky
({
topSpacing
:
0
})
$
(
'.sidebar-pagecontents'
).
sticky
({
topSpacing
:
15
,
bottomSpacing
:
75
})
// ====================================
// ====================================
// Notifications
// Notifications
...
...
client/scss/components/_editor.scss
View file @
2876b693
.editor-toolbar
{
.editor-toolbar
{
z-index
:
2
;
z-index
:
2
;
background
-color
:
mc
(
'indigo'
,
'900'
);
background
:
linear-gradient
(
to
bottom
,
mc
(
'blue-grey'
,
'900'
)
,
mc
(
'blue-grey'
,
'700'
)
);
border
:
none
;
border
:
none
;
border-top
:
1px
solid
mc
(
'blue-grey'
,
'400'
);
border-top-left-radius
:
0
;
border-top-left-radius
:
0
;
border-top-right-radius
:
0
;
border-top-right-radius
:
0
;
opacity
:
1
;
opacity
:
1
;
...
@@ -10,6 +11,7 @@
...
@@ -10,6 +11,7 @@
top
:
50px
;
top
:
50px
;
left
:
0
;
left
:
0
;
width
:
100%
;
width
:
100%
;
box-shadow
:
0
0
5px
rgba
(
0
,
0
,
0
,.
75
);
&
:hover
{
&
:hover
{
opacity
:
1
;
opacity
:
1
;
...
@@ -299,27 +301,33 @@
...
@@ -299,27 +301,33 @@
.CodeMirror
{
.CodeMirror
{
border-left
:
none
;
border-left
:
none
;
border-right
:
none
;
border-right
:
none
;
padding-top
:
52px
;
margin-top
:
49px
;
font-family
:
$core-font-monospace
;
font-family
:
$core-font-standard
;
border
:
10px
solid
mc
(
'blue-grey'
,
'100'
);
}
}
.CodeMirror
.CodeMirror-code
.cm-url
{
.CodeMirror
.CodeMirror-code
{
.cm-url
{
color
:
#00ACC1
;
color
:
#00ACC1
;
}
}
.CodeMirror
.CodeMirror-code
.cm-header-1
{
.cm-header-1
{
color
:
#635c8c
;
color
:
#635c8c
;
font-size
:
2em
;
font-size
:
2em
;
font-weight
:
400
;
font-weight
:
400
;
}
}
.CodeMirror
.CodeMirror-code
.cm-header-2
{
.cm-header-2
{
color
:
#222324
;
color
:
#222324
;
font-size
:
1
.75em
;
font-size
:
1
.75em
;
font-weight
:
300
;
font-weight
:
300
;
}
}
.CodeMirror
.CodeMirror-code
.cm-header-3
{
.cm-header-3
{
color
:
#222324
;
color
:
#222324
;
font-size
:
1
.5em
;
font-size
:
1
.5em
;
font-weight
:
300
;
font-weight
:
300
;
}
.cm-formatting-code-block
,
.cm-comment
{
font-family
:
$core-font-monospace
;
}
}
}
.editor-toolbar
.fa
{
.editor-toolbar
.fa
{
...
...
server/views/common/header.pug
View file @
2876b693
#header-container
#header-container
nav.nav
.stickyscroll
#header
nav.nav#header
.nav-left
.nav-left
block rootNavLeft
block rootNavLeft
a.nav-item(href='/')
a.nav-item(href='/')
...
...
server/views/pages/view.pug
View file @
2876b693
...
@@ -64,7 +64,7 @@ block content
...
@@ -64,7 +64,7 @@ block content
a(href='/login')
a(href='/login')
i.icon-unlock
i.icon-unlock
span= t('nav.login')
span= t('nav.login')
aside.s
tickyscroll
aside.s
idebar-pagecontents
.sidebar-label
.sidebar-label
span= t('sidebar.pagecontents')
span= t('sidebar.pagecontents')
ul.sidebar-menu
ul.sidebar-menu
...
...
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