liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: navbar offset in editor + editor UI changes

Browse Source
This commit is contained in:
NGPixel 2017-05-19 19:53:23 -04:00
parent 44220f1de0
commit 2876b6935b
5 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -1,5 +1,6 @@
{ {
"eslint.enable": true, "eslint.enable": true,
"puglint.enable": true, "puglint.enable": true,
"standard.enable": false "standard.enable": false,
"editor.formatOnSave": true
} }

3
client/js/app.js
View File

@ -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

22
client/scss/components/_editor.scss
View File

@ -1,8 +1,9 @@
.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 @@
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,28 +301,34 @@
.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 {
font-size: 14px; font-size: 14px;

2
server/views/common/header.pug
View File

@ -1,6 +1,6 @@
#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='/')

2
server/views/pages/view.pug
View File

@ -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.stickyscroll aside.sidebar-pagecontents
.sidebar-label .sidebar-label
span= t('sidebar.pagecontents') span= t('sidebar.pagecontents')
ul.sidebar-menu ul.sidebar-menu