Markdown display fixes + error pages
This commit is contained in:
NGPixel committed
1 parent
f7ce81e8c9
commit
593481c7e1
11 files changed
+48
-26
No files matched your search
@@ -20,6 +20,7 @@ before_script:
|
||||
- npm install -g snyk
|
||||
- snyk auth $SNYK_TOKEN
|
||||
before_deploy:
|
||||
- npm install github:requarks/core -f
|
||||
- npm install -g gulp
|
||||
- gulp deploy
|
||||
- snyk monitor
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<a href="https://github.com/Requarks/wiki">
|
||||
<img src="https://raw.githubusercontent.com/Requarks/wiki/master/assets/favicons/favicon-96x96.png" alt="Requarks Wiki" title="Requarks Wiki" align="right" />
|
||||
<img src="https://raw.githubusercontent.com/Requarks/wiki/master/assets/favicons/favicon-96x96.png" alt="Wiki.js" title="Wiki.js" align="right" />
|
||||
</a>
|
||||
|
||||
# Requarks Wiki
|
||||
# Wiki.js
|
||||
|
||||
[](https://github.com/Requarks/wiki/releases)
|
||||
[](https://github.com/requarks/wiki/blob/master/LICENSE)
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
### Documentation
|
||||
|
||||
- [Installation Guide](https://requarks-wiki.readme.io/docs/prerequisites)
|
||||
- [Installation Guide](https://wiki.requarks.io/install)
|
||||
|
||||
##### Milestones
|
||||
- [ ] Account Management
|
||||
|
||||
@@ -91,7 +91,7 @@ var job = new cron({
|
||||
});
|
||||
|
||||
fs.walk(repoPath).on('data', function (item) {
|
||||
if(path.extname(item.path) === '.md') {
|
||||
if(path.extname(item.path) === '.md' && path.basename(item.path) !== 'README.md') {
|
||||
|
||||
let entryPath = entries.parsePath(entries.getEntryPathFromFullPath(item.path));
|
||||
let cachePath = entries.getCachePath(entryPath);
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
@charset "UTF-8";a,hr{padding:0}a,button,input,select,textarea{margin:0}article,aside,details,figure,footer,header,hr,main,nav,section,summary{display:block}.container,sub,sup{position:relative}abbr,address,article,aside,audio,b,blockquote,body,body div,caption,cite,code,dd,del,details,dfn,dl,dt,em,fieldset,figure,footer,form,h1,h2,h3,h4,h5,h6,header,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,p,pre,q,samp,section,small,span,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,ul,var,video{margin:0;padding:0;border:0;font-size:100%;font-weight:400;vertical-align:baseline;background:0 0}input[type=checkbox],th{vertical-align:bottom}embed,img,object{max-width:100%}ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}a{font-size:100%;vertical-align:baseline;background:0 0;color:#3949ab;text-decoration:none}del{text-decoration:line-through}abbr[title],dfn[title]{border-bottom:1px dotted #000;cursor:help}#alerts>ul>li,.button,.clickable,button,input[type=button],input[type=file],input[type=submit],label{cursor:pointer}th{font-weight:700}td{font-weight:400;vertical-align:top}hr{height:1px;border:0;border-top:1px solid #ccc;margin:1em 0}input,select{vertical-align:middle}pre{white-space:pre;white-space:pre-wrap;white-space:pre-line;word-wrap:break-word}input[type=radio]{vertical-align:text-bottom}.ie7 input[type=checkbox]{vertical-align:baseline}.ie6 input{vertical-align:text-bottom}input,select,textarea{font:99% sans-serif}table{border-collapse:separate;border-spacing:0;font:100%}small{font-size:85%}strong{font-weight:700}td,td img{vertical-align:top}sub,sup{font-size:75%;line-height:0}sup{top:-.5em}sub{bottom:-.25em}code,kbd,pre,samp{font-family:monospace,sans-serif}button,input[type=button]{width:auto;overflow:visible}.ie7 img{-ms-interpolation-mode:bicubic}.clearfix:after{content:" ";display:block;clear:both}@font-face{font-family:core-icons;src:url(/fonts/core-icons.ttf?a4cyvk) format("truetype"),url(/fonts/core-icons.woff?a4cyvk) format("woff"),url(/fonts/core-icons.svg?a4cyvk#core-icons) format("svg");font-weight:400;font-style:normal}[class*=" icon-"],[class^=icon-]{font-family:core-icons!important;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.button,html{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"}.icon-th-small:before{content:""}.icon-th-menu:before{content:""}.icon-th-list:before{content:""}.icon-th-large:before{content:""}.icon-home:before{content:""}.icon-location:before{content:""}.icon-link:before{content:""}.icon-starburst:before{content:""}.icon-starburst-outline:before{content:""}.icon-star:before{content:""}.icon-flow-children:before{content:""}.icon-export:before{content:""}.icon-delete:before{content:""}.icon-delete-outline:before{content:""}.icon-cloud-storage:before{content:""}.icon-backspace:before{content:""}.icon-attachment:before{content:""}.icon-arrow-move:before{content:""}.icon-warning:before{content:""}.icon-location-arrow:before{content:""}.icon-point-of-interest:before{content:""}.icon-infinity:before{content:""}.icon-eye:before{content:""}.icon-refresh:before{content:""}.icon-pin:before{content:""}.icon-eject:before{content:""}.icon-arrow-sync:before{content:""}.icon-arrow-shuffle:before{content:""}.icon-arrow-repeat:before{content:""}.icon-arrow-minimise:before{content:""}.icon-arrow-maximise:before{content:""}.icon-arrow-loop:before{content:""}.icon-spanner:before{content:""}.icon-power:before{content:""}.icon-flag:before{content:""}.icon-th-large-outline:before{content:""}.icon-th-small-outline:before{content:""}.icon-th-menu-outline:before{content:""}.icon-th-list-outline:before{content:""}.icon-home-outline:before{content:""}.icon-trash:before{content:""}.icon-star-outline:before{content:""}.icon-mail:before{content:""}.icon-heart-outline:before{content:""}.icon-flash-outline:before{content:""}.icon-watch:before{content:""}.icon-warning-outline:before{content:""}.icon-location-arrow-outline:before{content:""}.icon-info-outline:before{content:""}.icon-backspace-outline:before{content:""}.icon-upload-outline:before{content:""}.icon-tag:before{content:""}.icon-tabs-outline:before{content:""}.icon-pin-outline:before{content:""}.icon-pipette:before{content:""}.icon-pencil:before{content:""}.icon-folder:before{content:""}.icon-folder-delete:before{content:""}.icon-folder-add:before{content:""}.icon-edit:before{content:""}.icon-document:before{content:""}.icon-document-delete:before{content:""}.icon-document-add:before{content:""}.icon-brush:before{content:""}.icon-thumbs-up:befLine truncated
|
||||
@charset "UTF-8";a,hr{padding:0}a,button,input,select,textarea{margin:0}article,aside,details,figure,footer,header,hr,main,nav,section,summary{display:block}.container,sub,sup{position:relative}abbr,address,article,aside,audio,b,blockquote,body,body div,caption,cite,code,dd,del,details,dfn,dl,dt,em,fieldset,figure,footer,form,h1,h2,h3,h4,h5,h6,header,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,p,pre,q,samp,section,small,span,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,ul,var,video{margin:0;padding:0;border:0;font-size:100%;font-weight:400;vertical-align:baseline;background:0 0}input[type=checkbox],th{vertical-align:bottom}embed,img,object{max-width:100%}ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}a{font-size:100%;vertical-align:baseline;background:0 0;color:#3949ab;text-decoration:none}del{text-decoration:line-through}abbr[title],dfn[title]{border-bottom:1px dotted #000;cursor:help}#alerts>ul>li,.button,.clickable,button,input[type=button],input[type=file],input[type=submit],label{cursor:pointer}th{font-weight:700}td{font-weight:400;vertical-align:top}hr{height:1px;border:0;border-top:1px solid #ccc;margin:1em 0}input,select{vertical-align:middle}pre{white-space:pre;white-space:pre-wrap;white-space:pre-line;word-wrap:break-word}input[type=radio]{vertical-align:text-bottom}.ie7 input[type=checkbox]{vertical-align:baseline}.ie6 input{vertical-align:text-bottom}input,select,textarea{font:99% sans-serif}table{border-collapse:separate;border-spacing:0;font:100%}small{font-size:85%}strong{font-weight:700}td,td img{vertical-align:top}sub,sup{font-size:75%;line-height:0}sup{top:-.5em}sub{bottom:-.25em}code,kbd,pre,samp{font-family:monospace,sans-serif}button,input[type=button]{width:auto;overflow:visible}.ie7 img{-ms-interpolation-mode:bicubic}.clearfix:after{content:" ";display:block;clear:both}@font-face{font-family:core-icons;src:url(/fonts/core-icons.ttf?a4cyvk) format("truetype"),url(/fonts/core-icons.woff?a4cyvk) format("woff"),url(/fonts/core-icons.svg?a4cyvk#core-icons) format("svg");font-weight:400;font-style:normal}[class*=" icon-"],[class^=icon-]{font-family:core-icons!important;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.button,html{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"}.icon-th-small:before{content:""}.icon-th-menu:before{content:""}.icon-th-list:before{content:""}.icon-th-large:before{content:""}.icon-home:before{content:""}.icon-location:before{content:""}.icon-link:before{content:""}.icon-starburst:before{content:""}.icon-starburst-outline:before{content:""}.icon-star:before{content:""}.icon-flow-children:before{content:""}.icon-export:before{content:""}.icon-delete:before{content:""}.icon-delete-outline:before{content:""}.icon-cloud-storage:before{content:""}.icon-backspace:before{content:""}.icon-attachment:before{content:""}.icon-arrow-move:before{content:""}.icon-warning:before{content:""}.icon-location-arrow:before{content:""}.icon-point-of-interest:before{content:""}.icon-infinity:before{content:""}.icon-eye:before{content:""}.icon-refresh:before{content:""}.icon-pin:before{content:""}.icon-eject:before{content:""}.icon-arrow-sync:before{content:""}.icon-arrow-shuffle:before{content:""}.icon-arrow-repeat:before{content:""}.icon-arrow-minimise:before{content:""}.icon-arrow-maximise:before{content:""}.icon-arrow-loop:before{content:""}.icon-spanner:before{content:""}.icon-power:before{content:""}.icon-flag:before{content:""}.icon-th-large-outline:before{content:""}.icon-th-small-outline:before{content:""}.icon-th-menu-outline:before{content:""}.icon-th-list-outline:before{content:""}.icon-home-outline:before{content:""}.icon-trash:before{content:""}.icon-star-outline:before{content:""}.icon-mail:before{content:""}.icon-heart-outline:before{content:""}.icon-flash-outline:before{content:""}.icon-watch:before{content:""}.icon-warning-outline:before{content:""}.icon-location-arrow-outline:before{content:""}.icon-info-outline:before{content:""}.icon-backspace-outline:before{content:""}.icon-upload-outline:before{content:""}.icon-tag:before{content:""}.icon-tabs-outline:before{content:""}.icon-pin-outline:before{content:""}.icon-pipette:before{content:""}.icon-pencil:before{content:""}.icon-folder:before{content:""}.icon-folder-delete:before{content:""}.icon-folder-add:before{content:""}.icon-edit:before{content:""}.icon-document:before{content:""}.icon-document-delete:before{content:""}.icon-document-add:before{content:""}.icon-brush:before{content:""}.icon-thumbs-up:befLine truncated
|
||||
@@ -0,0 +1 @@
|
||||
@charset "UTF-8";.button,.button:hover,a{text-decoration:none}a,hr{padding:0}a,button,input,select,textarea{margin:0}article,aside,details,figure,footer,header,hr,main,nav,section,summary{display:block}abbr,address,article,aside,audio,b,blockquote,body,body div,caption,cite,code,dd,del,details,dfn,dl,dt,em,fieldset,figure,footer,form,h1,h2,h3,h4,h5,h6,header,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,p,pre,q,samp,section,small,span,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,ul,var,video{margin:0;padding:0;border:0;font-size:100%;font-weight:400;vertical-align:baseline;background:0 0}input[type=checkbox],th{vertical-align:bottom}embed,img,object{max-width:100%}ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}a{font-size:100%;vertical-align:baseline;background:0 0;color:#3949ab}del{text-decoration:line-through}abbr[title],dfn[title]{border-bottom:1px dotted #000;cursor:help}.button,.clickable,button,input[type=button],input[type=file],input[type=submit],label{cursor:pointer}th{font-weight:700}td{font-weight:400;vertical-align:top}hr{height:1px;border:0;border-top:1px solid #ccc;margin:1em 0}input,select{vertical-align:middle}pre{white-space:pre;white-space:pre-wrap;white-space:pre-line;word-wrap:break-word}input[type=radio]{vertical-align:text-bottom}.ie7 input[type=checkbox]{vertical-align:baseline}.ie6 input{vertical-align:text-bottom}input,select,textarea{font:99% sans-serif}table{border-collapse:separate;border-spacing:0;font:100%}small{font-size:85%}strong{font-weight:700}td,td img{vertical-align:top}sub,sup{font-size:75%;line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}code,kbd,pre,samp{font-family:monospace,sans-serif}button,input[type=button]{width:auto;overflow:visible}.ie7 img{-ms-interpolation-mode:bicubic}.clearfix:after{content:" ";display:block;clear:both}@font-face{font-family:core-icons;src:url(/fonts/core-icons.ttf?a4cyvk) format("truetype"),url(/fonts/core-icons.woff?a4cyvk) format("woff"),url(/fonts/core-icons.svg?a4cyvk#core-icons) format("svg");font-weight:400;font-style:normal}[class*=" icon-"],[class^=icon-]{font-family:core-icons!important;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.button,html{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"}.icon-th-small:before{content:""}.icon-th-menu:before{content:""}.icon-th-list:before{content:""}.icon-th-large:before{content:""}.icon-home:before{content:""}.icon-location:before{content:""}.icon-link:before{content:""}.icon-starburst:before{content:""}.icon-starburst-outline:before{content:""}.icon-star:before{content:""}.icon-flow-children:before{content:""}.icon-export:before{content:""}.icon-delete:before{content:""}.icon-delete-outline:before{content:""}.icon-cloud-storage:before{content:""}.icon-backspace:before{content:""}.icon-attachment:before{content:""}.icon-arrow-move:before{content:""}.icon-warning:before{content:""}.icon-location-arrow:before{content:""}.icon-point-of-interest:before{content:""}.icon-infinity:before{content:""}.icon-eye:before{content:""}.icon-refresh:before{content:""}.icon-pin:before{content:""}.icon-eject:before{content:""}.icon-arrow-sync:before{content:""}.icon-arrow-shuffle:before{content:""}.icon-arrow-repeat:before{content:""}.icon-arrow-minimise:before{content:""}.icon-arrow-maximise:before{content:""}.icon-arrow-loop:before{content:""}.icon-spanner:before{content:""}.icon-power:before{content:""}.icon-flag:before{content:""}.icon-th-large-outline:before{content:""}.icon-th-small-outline:before{content:""}.icon-th-menu-outline:before{content:""}.icon-th-list-outline:before{content:""}.icon-home-outline:before{content:""}.icon-trash:before{content:""}.icon-star-outline:before{content:""}.icon-mail:before{content:""}.icon-heart-outline:before{content:""}.icon-flash-outline:before{content:""}.icon-watch:before{content:""}.icon-warning-outline:before{content:""}.icon-location-arrow-outline:before{content:""}.icon-info-outline:before{content:""}.icon-backspace-outline:before{content:""}.icon-upload-outline:before{content:""}.icon-tag:before{content:""}.icon-tabs-outline:before{content:""}.icon-pin-outline:before{content:""}.icon-pipette:before{content:""}.icon-pencil:before{content:""}.icon-folder:before{content:""}.icon-folder-delete:before{content:""}.icon-folder-add:before{content:""}.icon-edit:before{content:""}.icon-document:before{content:""}.icon-document-delete:before{content:""}.icon-document-add:before{content:""}.icon-brush:before{content:""}.icon-thumbs-up:before{conteLine truncated
|
||||
@@ -0,0 +1,9 @@
|
||||
|
||||
$primary: 'indigo';
|
||||
|
||||
@import 'core-client/scss/core';
|
||||
@import 'core-client/scss/components/button';
|
||||
@import 'core-client/scss/components/grid';
|
||||
@import 'core-client/scss/components/typography';
|
||||
|
||||
@import 'core-client/scss/pages/error';
|
||||
@@ -35,6 +35,8 @@ paths:
|
||||
# Site Authentication
|
||||
# ---------------------------------------------------------------------
|
||||
|
||||
public: false
|
||||
|
||||
auth:
|
||||
local:
|
||||
enabled: true
|
||||
|
||||
+14
-1
@@ -55,7 +55,7 @@ var mkdown = md({
|
||||
// Rendering rules
|
||||
|
||||
mkdown.renderer.rules.emoji = function(token, idx) {
|
||||
return '<i class="twa twa-' + token[idx].markup + '"></i>';
|
||||
return '<i class="twa twa-' + _.replace(token[idx].markup, /_/g, '-') + '"></i>';
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -171,6 +171,19 @@ const parseContent = (content) => {
|
||||
cr(elm).replaceWith(txtLink);
|
||||
});
|
||||
|
||||
//-> Re-attach blockquote styling classes to their parents
|
||||
|
||||
cr.root().children('blockquote').each((i, elm) => {
|
||||
if(cr(elm).children().length > 0) {
|
||||
let bqLastChild = cr(elm).children().last()[0];
|
||||
let bqLastChildClasses = cr(bqLastChild).attr('class');
|
||||
if(bqLastChildClasses.length > 0) {
|
||||
cr(bqLastChild).removeAttr('class');
|
||||
cr(elm).addClass(bqLastChildClasses);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
output = cr.html();
|
||||
|
||||
return output;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
footer.footer
|
||||
span
|
||||
= t('footer.poweredby') + ' '
|
||||
a(href='https://github.com/Requarks/wiki') Requarks Wiki
|
||||
a(href='https://github.com/Requarks/wiki') Wiki.js
|
||||
| .
|
||||
ul
|
||||
li: a(href='/')= t('footer.home')
|
||||
|
||||
@@ -19,13 +19,11 @@ html
|
||||
|
||||
// CSS
|
||||
link(type='text/css', rel='stylesheet', href='/css/libs.css')
|
||||
link(type='text/css', rel='stylesheet', href='/css/app.css')
|
||||
link(type='text/css', rel='stylesheet', href='/css/error.css')
|
||||
|
||||
body(class='server-error')
|
||||
section.hero.is-danger.is-fullheight
|
||||
.hero-body
|
||||
.container
|
||||
a(href='/'): img(src='/favicons/android-icon-96x96.png')
|
||||
h1.title(style={ 'margin-top': '30px'}) Forbidden
|
||||
h2.subtitle(style={ 'margin-bottom': '50px'}) Sorry, you don't have the necessary permissions to access this page.
|
||||
a.button.is-dark.is-inverted(href='/') Go Home
|
||||
body(class='is-forbidden')
|
||||
.container
|
||||
a(href='/'): img(src='/favicons/android-icon-96x96.png')
|
||||
h1.title(style={ 'margin-top': '30px'}) Forbidden
|
||||
h2.subtitle(style={ 'margin-bottom': '50px'}) Sorry, you don't have the necessary permissions to access this page.
|
||||
a.button.is-amber.is-inverted(href='/') Go Home
|
||||
@@ -19,14 +19,12 @@ html
|
||||
|
||||
// CSS
|
||||
link(type='text/css', rel='stylesheet', href='/css/libs.css')
|
||||
link(type='text/css', rel='stylesheet', href='/css/app.css')
|
||||
link(type='text/css', rel='stylesheet', href='/css/error.css')
|
||||
|
||||
body(class='server-error')
|
||||
section.hero.is-dark.is-fullheight
|
||||
.hero-body
|
||||
.container
|
||||
a(href='/'): img(src='/favicons/android-icon-96x96.png')
|
||||
h1.title(style={ 'margin-top': '30px'})= message
|
||||
h2.subtitle(style={ 'margin-bottom': '50px'}) Would you like to create this entry?
|
||||
a.button.is-dark.is-inverted(href='/create/' + newpath, style={'margin-right': '5px'}) Create
|
||||
a.button.is-dark.is-inverted(href='/') Go Home
|
||||
body(class='is-notexist')
|
||||
.container
|
||||
a(href='/'): img(src='/favicons/android-icon-96x96.png')
|
||||
h1= message
|
||||
h2 Would you like to create this entry?
|
||||
a.button.is-amber.is-inverted(href='/create/' + newpath) Create
|
||||
a.button.is-amber.is-inverted(href='/') Go Home
|
||||
Reference in new issue
Block a user