diff --git a/.gitignore b/.gitignore index ab83c145ff..c001dc689e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ public/views/build public/uploads/* !public/uploads/.gitkeep + +#ignore visual studio code +.vscode \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0fa35246e3..cea52f4c48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM node:boron apt-get update && \ apt-get install -y git postgresql-client-9.6 -#make directory +# make directory RUN mkdir /hackadoc WORKDIR /hackadoc diff --git a/package.json b/package.json index 441768e806..70647eae64 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "Idle.Js": "git+https://github.com/shawnmclean/Idle.js", - "asciidoctor.js": "^1.5.6-preview.3", + "asciidoctor.js": "^1.5.7-beta.1", "async": "^2.1.4", "aws-sdk": "^2.7.20", "blueimp-md5": "^2.6.0", diff --git a/public/css/extra.css b/public/css/extra.css index 8cd2a7907c..f2c5c63bd2 100644 --- a/public/css/extra.css +++ b/public/css/extra.css @@ -367,3 +367,32 @@ small .dropdown a:focus, small .dropdown a:hover { } .line-through{text-decoration:line-through} + +/*admonition css*/ +.admonitionblock td.icon [class^="fa icon-"]{ + font-size:2.5em; + text-shadow:1px 1px 2px rgba(0,0,0,.5); + cursor:default +} +.admonitionblock td.icon .icon-note::before{ + content:"\f05a"; + color:#19407c +} +.admonitionblock td.icon .icon-tip::before{ + content:"\f0eb"; + text-shadow:1px 1px 2px rgba(155,155,0,.8); + color:#111 +} + +.admonitionblock td.icon .icon-warning::before{ + content:"\f071"; + color:#bf6900 +} +.admonitionblock td.icon .icon-caution::before{ + content:"\f06d"; + color:#bf3400 +} +.admonitionblock td.icon .icon-important::before{ + content:"\f06a"; + color:#bf0000 +} \ No newline at end of file