diff --git a/index.html b/index.html index 6023ae8b..c3795a91 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ TomoMaster APIs - + @@ -44,6 +44,18 @@ +
+ +
NAV @@ -51,7 +63,13 @@
- +
@@ -84,218 +102,218 @@
- -
- -
+ +
diff --git a/index.js b/index.js index f2d974d8..2ac2be48 100644 --- a/index.js +++ b/index.js @@ -348,16 +348,32 @@ function render(inputStr, options, callback) { return result; //[{id:'test',content:'hello',children:[]}]; }; locals.partial = partial; - locals.image_tag = function (image, altText, className) { + locals.image_tag = function (image, altText, className, isDiv) { var imageSource = "source/images/" + image; if (globalOptions.inline) { var imgContent = safeReadFileSync(path.join(__dirname, imageSource)); imageSource = getBase64ImageSource(imageSource, imgContent); } - return '' + altText + ''; + if (isDiv) { + return ''; + } + else { + return '' + altText + ''; + } + }; + locals.favico = function(image) { + var imageSource = "source/images/favico.ico"; + if (image) { + imageSource = "source/images/" + image; + } + if (globalOptions.inline) { + var imgContent = safeReadFileSync(path.join(__dirname, imageSource)); + imageSource = getBase64ImageSource(imageSource, imgContent); + } + return ''; }; locals.logo_image_tag = function () { - if (!globalOptions.logo) return locals.image_tag('logo.png', 'Logo', 'logo'); + if (!globalOptions.logo) return locals.image_tag('logo.png', 'Logo', 'logo', true); var imageSource = path.resolve(process.cwd(), globalOptions.logo); var imgContent = safeReadFileSync(imageSource); if (globalOptions.inline) { @@ -367,9 +383,9 @@ function render(inputStr, options, callback) { fs.writeFileSync(path.join(__dirname, logoPath), imgContent); imageSource = logoPath; } - var html = ''; + var html = ''; if (globalOptions['logo-url']) { - html = '' + html + ''; + html = '' + html + ''; } return html; }; diff --git a/package-lock.json b/package-lock.json index 31f14278..c5179a10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", "requires": { - "mime-types": "~2.1.16", + "mime-types": "2.1.16", "negotiator": "0.6.1" } }, @@ -35,9 +35,9 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" } }, "amdefine": { @@ -70,8 +70,8 @@ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.2.11" } }, "argparse": { @@ -79,7 +79,7 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" } }, "array-find-index": { @@ -135,7 +135,7 @@ "dev": true, "optional": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "block-stream": { @@ -144,7 +144,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "~2.0.0" + "inherits": "2.0.3" } }, "body-parser": { @@ -153,15 +153,15 @@ "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", "requires": { "bytes": "3.0.0", - "content-type": "~1.0.4", + "content-type": "1.0.4", "debug": "2.6.9", - "depd": "~1.1.1", - "http-errors": "~1.6.2", + "depd": "1.1.1", + "http-errors": "1.6.2", "iconv-lite": "0.4.19", - "on-finished": "~2.3.0", + "on-finished": "2.3.0", "qs": "6.5.1", "raw-body": "2.3.2", - "type-is": "~1.6.15" + "type-is": "1.6.15" }, "dependencies": { "qs": { @@ -182,7 +182,7 @@ "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", "dev": true, "requires": { - "balanced-match": "^0.4.1", + "balanced-match": "0.4.2", "concat-map": "0.0.1" } }, @@ -214,8 +214,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "2.1.1", + "map-obj": "1.0.1" }, "dependencies": { "camelcase": { @@ -237,8 +237,8 @@ "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "chalk": { @@ -247,11 +247,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "cheerio": { @@ -259,12 +259,12 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz", "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=", "requires": { - "css-select": "~1.2.0", - "dom-serializer": "~0.1.0", - "entities": "~1.1.1", - "htmlparser2": "^3.9.1", - "lodash": "^4.15.0", - "parse5": "^3.0.1" + "css-select": "1.2.0", + "dom-serializer": "0.1.0", + "entities": "1.1.1", + "htmlparser2": "3.9.2", + "lodash": "4.17.10", + "parse5": "3.0.2" } }, "cliui": { @@ -273,9 +273,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "co": { @@ -296,7 +296,7 @@ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "compressible": { @@ -304,7 +304,7 @@ "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz", "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=", "requires": { - "mime-db": ">= 1.30.0 < 2" + "mime-db": "1.31.0" }, "dependencies": { "mime-db": { @@ -319,13 +319,13 @@ "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz", "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=", "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.4", "bytes": "3.0.0", - "compressible": "~2.0.11", + "compressible": "2.0.12", "debug": "2.6.9", - "on-headers": "~1.0.1", + "on-headers": "1.0.1", "safe-buffer": "5.1.1", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "safe-buffer": { @@ -378,8 +378,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "which": "1.3.1" } }, "css-select": { @@ -387,10 +387,10 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", + "boolbase": "1.0.0", + "css-what": "2.1.0", "domutils": "1.5.1", - "nth-check": "~1.0.1" + "nth-check": "1.0.1" } }, "css-what": { @@ -404,7 +404,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "^1.0.1" + "array-find-index": "1.0.2" } }, "dashdash": { @@ -413,7 +413,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" }, "dependencies": { "assert-plus": { @@ -464,8 +464,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" + "domelementtype": "1.1.3", + "entities": "1.1.1" }, "dependencies": { "domelementtype": { @@ -485,7 +485,7 @@ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", "requires": { - "domelementtype": "1" + "domelementtype": "1.3.0" } }, "domutils": { @@ -493,8 +493,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" } }, "ecc-jsbn": { @@ -504,7 +504,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "~0.1.0" + "jsbn": "0.1.1" } }, "ee-first": { @@ -530,12 +530,12 @@ "dev": true, "requires": { "ejs": "2.4.1", - "ejs-include-regex": "^1.0.0", - "glob": "^7.0.3", - "read-input": "^0.3.1", - "rewire": "^2.5.1", - "syntax-error": "^1.1.6", - "yargs": "^4.6.0" + "ejs-include-regex": "1.0.0", + "glob": "7.1.2", + "read-input": "0.3.1", + "rewire": "2.5.2", + "syntax-error": "1.3.0", + "yargs": "4.8.1" }, "dependencies": { "ejs": { @@ -562,7 +562,7 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "escape-html": { @@ -591,36 +591,36 @@ "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz", "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=", "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.4", "array-flatten": "1.1.1", "body-parser": "1.18.2", "content-disposition": "0.5.2", - "content-type": "~1.0.4", + "content-type": "1.0.4", "cookie": "0.3.1", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.1", - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.1", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", "finalhandler": "1.1.0", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.2", + "proxy-addr": "2.0.2", "qs": "6.5.1", - "range-parser": "~1.2.0", + "range-parser": "1.2.0", "safe-buffer": "5.1.1", "send": "0.16.1", "serve-static": "1.13.1", "setprototypeof": "1.1.0", - "statuses": "~1.3.1", - "type-is": "~1.6.15", + "statuses": "1.3.1", + "type-is": "1.6.15", "utils-merge": "1.0.1", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "qs": { @@ -665,12 +665,12 @@ "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.3.1", - "unpipe": "~1.0.0" + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" } }, "find-up": { @@ -679,8 +679,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "forever-agent": { @@ -711,10 +711,10 @@ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.3" } }, "gauge": { @@ -723,14 +723,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "gaze": { @@ -739,7 +739,7 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "^1.0.0" + "globule": "1.2.1" } }, "get-caller-file": { @@ -760,7 +760,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" }, "dependencies": { "assert-plus": { @@ -777,12 +777,12 @@ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "globule": { @@ -791,9 +791,9 @@ "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" + "glob": "7.1.2", + "lodash": "4.17.10", + "minimatch": "3.0.4" } }, "graceful-fs": { @@ -808,7 +808,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-unicode": { @@ -833,12 +833,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "^1.3.0", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^2.0.2" + "domelementtype": "1.3.0", + "domhandler": "2.4.1", + "domutils": "1.5.1", + "entities": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.2.11" } }, "http-errors": { @@ -849,7 +849,7 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", - "statuses": ">= 1.3.1 < 2" + "statuses": "1.3.1" }, "dependencies": { "setprototypeof": { @@ -882,7 +882,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "inflight": { @@ -891,8 +891,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -928,7 +928,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-finite": { @@ -937,7 +937,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { @@ -946,7 +946,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-typedarray": { @@ -994,8 +994,8 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "1.0.10", + "esprima": "4.0.1" } }, "jsbn": { @@ -1048,7 +1048,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } }, "lazy-cache": { @@ -1062,7 +1062,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "linkify-it": { @@ -1070,7 +1070,7 @@ "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz", "integrity": "sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==", "requires": { - "uc.micro": "^1.0.1" + "uc.micro": "1.0.5" } }, "load-json-file": { @@ -1079,11 +1079,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "lodash": { @@ -1125,8 +1125,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, "lru-cache": { @@ -1135,8 +1135,8 @@ "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "map-obj": { @@ -1150,11 +1150,11 @@ "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz", "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==", "requires": { - "argparse": "^1.0.7", - "entities": "~1.1.1", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "argparse": "1.0.10", + "entities": "1.1.1", + "linkify-it": "2.1.0", + "mdurl": "1.0.1", + "uc.micro": "1.0.5" } }, "markdown-it-attrs": { @@ -1188,16 +1188,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.3.8", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" } }, "merge-descriptors": { @@ -1226,7 +1226,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz", "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=", "requires": { - "mime-db": "~1.29.0" + "mime-db": "1.29.0" } }, "minimatch": { @@ -1235,7 +1235,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.7" } }, "minimist": { @@ -1283,18 +1283,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.87.0", + "rimraf": "2.6.3", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.1" } }, "node-sass": { @@ -1303,25 +1303,25 @@ "integrity": "sha512-m6H1I6cHXsHsJ7BIWdnJsz9S9gVMyh+/H2cOTXgl2/2WqyyWlBcl4PHJcqrXo5RZVCfCUFqOtjPN0+0XbVHR5Q==", "dev": true, "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.10.0", - "node-gyp": "^3.3.1", - "npmlog": "^4.0.0", + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.1", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.10.0", + "node-gyp": "3.8.0", + "npmlog": "4.1.2", "request": "2.87.0", - "sass-graph": "^2.2.4", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0", + "true-case-path": "1.0.2" } }, "node-sass-asset-functions": { @@ -1330,9 +1330,9 @@ "integrity": "sha1-MnMjxwgEnqpgCYZJyd+hnQ+8Uhk=", "dev": true, "requires": { - "image-size": "^0.3.5", - "mime": "^1.3.4", - "node-sass": ">= 3.2 < 5" + "image-size": "0.3.5", + "mime": "1.6.0", + "node-sass": "4.9.1" } }, "nopt": { @@ -1341,7 +1341,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1" + "abbrev": "1.1.1" } }, "normalize-package-data": { @@ -1350,10 +1350,10 @@ "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs=", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.4.2", + "is-builtin-module": "1.0.0", + "semver": "5.3.0", + "validate-npm-package-license": "3.0.1" } }, "npmlog": { @@ -1362,10 +1362,10 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "nth-check": { @@ -1373,7 +1373,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "requires": { - "boolbase": "~1.0.0" + "boolbase": "1.0.0" } }, "number-is-nan": { @@ -1412,7 +1412,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "opn": { @@ -1420,7 +1420,7 @@ "resolved": "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz", "integrity": "sha512-Jd/GpzPyHF4P2/aNOVmS3lfMSWV9J7cOhCG1s08XCEAsPkB7lp6ddiU0J7XzyQRDUh8BqJ7PchfINjR8jyofRQ==", "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "1.1.0" } }, "os-homedir": { @@ -1435,7 +1435,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "^1.0.0" + "lcid": "1.0.0" } }, "os-tmpdir": { @@ -1450,8 +1450,8 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "parse-json": { @@ -1460,7 +1460,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.1" } }, "parse5": { @@ -1468,7 +1468,7 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz", "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=", "requires": { - "@types/node": "^6.0.46" + "@types/node": "6.0.84" } }, "parseurl": { @@ -1482,7 +1482,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "path-is-absolute": { @@ -1502,9 +1502,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -1525,7 +1525,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "process-nextick-args": { @@ -1538,7 +1538,7 @@ "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz", "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=", "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.1.2", "ipaddr.js": "1.5.2" } }, @@ -1582,9 +1582,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.3.8", + "path-type": "1.1.0" } }, "read-pkg-up": { @@ -1593,8 +1593,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" } }, "readable-stream": { @@ -1602,13 +1602,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz", "integrity": "sha512-h+8+r3MKEhkiVrwdKL8aWs1oc1VvBu33ueshOvS26RsZQ3Amhx/oO3TKe4lApSV9ueY6as8EAh7mtuFjdlhg9Q==", "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "safe-buffer": "~5.0.1", - "string_decoder": "~1.0.0", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.0.1", + "string_decoder": "1.0.2", + "util-deprecate": "1.0.2" } }, "redent": { @@ -1617,8 +1617,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" } }, "repeat-string": { @@ -1632,7 +1632,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "request": { @@ -1641,26 +1641,26 @@ "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "dev": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" + "aws-sign2": "0.7.0", + "aws4": "1.7.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" }, "dependencies": { "ajv": { @@ -1669,10 +1669,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "assert-plus": { @@ -1693,9 +1693,9 @@ "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "dev": true, "requires": { - "asynckit": "^0.4.0", + "asynckit": "0.4.0", "combined-stream": "1.0.6", - "mime-types": "^2.1.12" + "mime-types": "2.1.18" } }, "har-schema": { @@ -1710,8 +1710,8 @@ "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "dev": true, "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" + "ajv": "5.5.2", + "har-schema": "2.0.0" } }, "http-signature": { @@ -1720,9 +1720,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.2" } }, "mime-db": { @@ -1737,7 +1737,7 @@ "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { - "mime-db": "~1.33.0" + "mime-db": "1.33.0" } }, "performance-now": { @@ -1783,7 +1783,7 @@ "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { @@ -1792,7 +1792,7 @@ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.3" }, "dependencies": { "glob": { @@ -1801,12 +1801,12 @@ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } } } @@ -1827,10 +1827,10 @@ "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.15.0.tgz", "integrity": "sha512-1jWLToWx8ZV53Z1Jg+2fHl8dNFsxvQt2Cmrk4o/z1+MUdB5EXSU0QVuzlGGhfp7cQrYbEEfMO/TUWHfkBUqujQ==", "requires": { - "htmlparser2": "^3.9.0", - "lodash.escaperegexp": "^4.1.2", - "srcset": "^1.0.0", - "xtend": "^4.0.0" + "htmlparser2": "3.9.2", + "lodash.escaperegexp": "4.1.2", + "srcset": "1.0.0", + "xtend": "4.0.1" } }, "sass-graph": { @@ -1839,10 +1839,10 @@ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" + "glob": "7.1.2", + "lodash": "4.17.10", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" }, "dependencies": { "yargs": { @@ -1851,19 +1851,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" } }, "yargs-parser": { @@ -1872,7 +1872,7 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "3.0.0" } } } @@ -1883,8 +1883,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" + "js-base64": "2.4.5", + "source-map": "0.4.4" } }, "semver": { @@ -1899,18 +1899,18 @@ "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", "requires": { "debug": "2.6.9", - "depd": "~1.1.1", - "destroy": "~1.0.4", - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", "fresh": "0.5.2", - "http-errors": "~1.6.2", + "http-errors": "1.6.2", "mime": "1.4.1", "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.3.1" + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" }, "dependencies": { "mime": { @@ -1925,9 +1925,9 @@ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", "requires": { - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "parseurl": "~1.3.2", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.2", "send": "0.16.1" } }, @@ -1954,7 +1954,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } }, "spdx-correct": { @@ -1963,7 +1963,7 @@ "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", "dev": true, "requires": { - "spdx-license-ids": "^1.0.2" + "spdx-license-ids": "1.2.2" } }, "spdx-expression-parse": { @@ -1988,8 +1988,8 @@ "resolved": "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz", "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", "requires": { - "array-uniq": "^1.0.2", - "number-is-nan": "^1.0.0" + "array-uniq": "1.0.3", + "number-is-nan": "1.0.1" } }, "sshpk": { @@ -1998,15 +1998,15 @@ "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "dev": true, "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.2", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" }, "dependencies": { "assert-plus": { @@ -2028,7 +2028,7 @@ "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", "dev": true, "requires": { - "readable-stream": "^2.0.1" + "readable-stream": "2.2.11" } }, "string-width": { @@ -2037,9 +2037,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -2047,7 +2047,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz", "integrity": "sha1-sp4fThEl+pehA4K4pTNze3SR4Xk=", "requires": { - "safe-buffer": "~5.0.1" + "safe-buffer": "5.0.1" } }, "strip-ansi": { @@ -2056,7 +2056,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { @@ -2065,7 +2065,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-indent": { @@ -2074,7 +2074,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "^4.0.1" + "get-stdin": "4.0.1" } }, "supports-color": { @@ -2089,7 +2089,7 @@ "integrity": "sha1-HtkmbE1AvnXcVb+bsct3Biu5bKE=", "dev": true, "requires": { - "acorn": "^4.0.3" + "acorn": "4.0.13" } }, "tar": { @@ -2098,9 +2098,9 @@ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" } }, "tiny-opts-parser": { @@ -2114,7 +2114,7 @@ "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "dev": true, "requires": { - "punycode": "^1.4.1" + "punycode": "1.4.1" } }, "trim-newlines": { @@ -2129,7 +2129,7 @@ "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", "dev": true, "requires": { - "glob": "^6.0.4" + "glob": "6.0.4" }, "dependencies": { "glob": { @@ -2138,11 +2138,11 @@ "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "dev": true, "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } } } @@ -2153,7 +2153,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.0.1" } }, "tweetnacl": { @@ -2169,7 +2169,7 @@ "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.15" + "mime-types": "2.1.16" } }, "uc.micro": { @@ -2182,9 +2182,9 @@ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "camelcase": { @@ -2197,8 +2197,8 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" } }, @@ -2217,9 +2217,9 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -2258,8 +2258,8 @@ "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", "dev": true, "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" } }, "vary": { @@ -2273,9 +2273,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" }, "dependencies": { "assert-plus": { @@ -2292,7 +2292,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -2307,7 +2307,7 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "window-size": { @@ -2327,8 +2327,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" } }, "wrappy": { @@ -2360,20 +2360,20 @@ "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", "dev": true, "requires": { - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "lodash.assign": "^4.0.3", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.1", - "which-module": "^1.0.0", - "window-size": "^0.2.0", - "y18n": "^3.2.1", - "yargs-parser": "^2.4.1" + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "lodash.assign": "4.2.0", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "2.4.1" } }, "yargs-parser": { @@ -2382,8 +2382,8 @@ "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "lodash.assign": "^4.0.6" + "camelcase": "3.0.0", + "lodash.assign": "4.2.0" } } } diff --git a/pub/css/screen.css b/pub/css/screen.css index 1497c56f..4559cbed 100644 --- a/pub/css/screen.css +++ b/pub/css/screen.css @@ -431,12 +431,12 @@ License for the specific language governing permissions and limitations under the License. */ html, body { - color: #333; + color: #1b3a52; padding: 0; margin: 0; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - background-color: #F3F7F9; + background-color: #ffffff; height: 100%; -webkit-text-size-adjust: none; /* Never autoresize text */ } @@ -453,13 +453,16 @@ html, body { overflow-x: hidden; position: fixed; z-index: 30; - top: 0; + top: 70px; left: 0; bottom: 0; width: 230px; - background-color: #2E3336; + background-color: #f8f8f8; + border-right: 1px solid rgba(221, 221, 221, 0.5); font-size: 13px; - font-weight: bold; } + font-weight: 500; } + .toc-wrapper .toc-navbar { + display: none; } .toc-wrapper .lang-selector { display: none; } .toc-wrapper .lang-selector a { @@ -472,22 +475,22 @@ html, body { .toc-wrapper > .search { position: relative; } .toc-wrapper > .search input { - background: #2E3336; + background: #f8f8f8; border-width: 0 0 1px 0; - border-color: #666; + border-color: rgba(28, 32, 59, 0.25); padding: 6px 0 6px 20px; box-sizing: border-box; margin: 10px 15px; width: 200px; outline: none; - color: #fff; + color: rgba(27, 58, 82, 0.6); border-radius: 0; /* ios has a default border radius */ } .toc-wrapper > .search:before { position: absolute; top: 17px; left: 15px; - color: #fff; } + color: rgba(27, 58, 82, 0.6); } .toc-wrapper .search-results { margin-top: 0; box-sizing: border-box; @@ -497,7 +500,7 @@ html, body { transition-property: height, margin; transition-duration: 180ms; transition-timing-function: ease-in-out; - background: #1E2224; } + background: #f8f8f8; } .toc-wrapper .search-results.visible { height: 30%; margin-bottom: 1em; } @@ -505,7 +508,7 @@ html, body { margin: 1em 15px; line-height: 1; } .toc-wrapper .search-results a { - color: #fff; + color: rgba(27, 58, 82, 0.6); text-decoration: none; } .toc-wrapper .search-results a:hover { text-decoration: underline; } @@ -515,29 +518,34 @@ html, body { padding: 0; line-height: 28px; } .toc-wrapper li { - color: #fff; + color: rgba(27, 58, 82, 0.6); transition-property: background; transition-timing-function: linear; transition-duration: 200ms; } .toc-wrapper .toc-link.active { - background-color: #0F75D4; - color: #fff; } + background-color: #f8f8f8; + color: #142d5c; + border-left: 4px solid #142d5c; + padding-left: 11px; + font-weight: bold; } .toc-wrapper .toc-link.active-parent { - background-color: #1E2224; - color: #fff; } + background-color: #f8f8f8; + color: #142d5c; + font-weight: bold; } .toc-wrapper .toc-list-h2 { display: none; - background-color: #1E2224; + background-color: #f8f8f8; font-weight: 500; } .toc-wrapper .toc-h2 { padding-left: 25px; font-size: 12px; } + .toc-wrapper .toc-h2.active { + padding-left: 21px; } .toc-wrapper .toc-footer { padding: 1em 0; - margin-top: 1em; - border-top: 1px dashed #666; } + margin-top: 1em; } .toc-wrapper .toc-footer li, .toc-wrapper .toc-footer a { - color: #fff; + color: rgba(27, 58, 82, 0.6); text-decoration: none; } .toc-wrapper .toc-footer a:hover { text-decoration: underline; } @@ -553,7 +561,7 @@ html, body { white-space: nowrap; text-overflow: ellipsis; text-decoration: none; - color: #fff; + color: rgba(27, 58, 82, 0.6); transition-property: background; transition-timing-function: linear; transition-duration: 130ms; } @@ -564,7 +572,7 @@ html, body { position: fixed; top: 0; left: 0; - z-index: 100; + z-index: 10000; color: #000; text-decoration: none; font-weight: bold; @@ -574,7 +582,7 @@ html, body { #nav-button span { display: block; padding: 6px 6px 6px; - background-color: rgba(243, 247, 249, 0.7); + background-color: rgba(255, 255, 255, 0.7); transform-origin: 0 0; transform: rotate(-90deg) translate(-100%, 0); border-radius: 0 0 0 5px; } @@ -590,12 +598,12 @@ html, body { margin-left: 230px; position: relative; z-index: 10; - background-color: #F3F7F9; + background-color: #ffffff; min-height: 100%; padding-bottom: 1px; } .page-wrapper .dark-box { width: 50%; - background-color: #2E3336; + background-color: #272b4e; position: absolute; right: 0; top: 0; @@ -603,10 +611,10 @@ html, body { .page-wrapper .lang-selector { position: fixed; z-index: 50; - border-bottom: 5px solid #2E3336; } + border-bottom: 2px solid #444e88; } .lang-selector { - background-color: #1E2224; + background-color: #272b4e; width: 100%; font-weight: bold; } .lang-selector a { @@ -621,7 +629,7 @@ html, body { background-color: #111; color: #fff; } .lang-selector a.active { - background-color: #2E3336; + background-color: #444e88; color: #fff; } .lang-selector:after { content: ''; @@ -651,9 +659,8 @@ html, body { padding-bottom: 0.5em; margin-bottom: 21px; margin-top: 2em; - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; - background-color: #fdfdfd; } + border-bottom: 1px solid rgba(204, 204, 204, 0.6); + background-color: #ffffff; } .content h1:first-child, .content div:first-child + h1 { border-top-width: 0; margin-top: 0; } @@ -661,7 +668,7 @@ html, body { font-size: 19px; margin-top: 4em; margin-bottom: 0; - border-top: 1px solid #ccc; + border-top: 1px solid rgba(204, 204, 204, 0.6); padding-top: 1.2em; padding-bottom: 1.2em; background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0)); } @@ -676,8 +683,8 @@ html, body { font-size: 10px; } .content hr { margin: 2em 0; - border-top: 2px solid #2E3336; - border-bottom: 2px solid #F3F7F9; } + border-top: 2px solid #272b4e; + border-bottom: 2px solid #ffffff; } .content table { margin-bottom: 1em; overflow: auto; } @@ -698,7 +705,7 @@ html, body { .content table tr:nth-child(odd) > td { background-color: white; } .content table tr:nth-child(even) > td { - background-color: #fbfcfd; } + background-color: white; } .content dt { font-weight: bold; } .content dd { @@ -725,7 +732,7 @@ html, body { .content aside.warning { background-color: #c97a7e; } .content aside.success { - background-color: #6ac174; } + background-color: rgba(76, 175, 80, 0.3); } .content aside:before { vertical-align: middle; padding-right: 0.5em; @@ -738,7 +745,7 @@ html, body { background: linear-gradient(to top left, #F7E633 0%, #F1D32F 100%); } .content pre, .content blockquote { - background-color: #1E2224; + background-color: #1c213a; color: #fff; margin: 0; width: 50%; @@ -758,15 +765,24 @@ html, body { padding: 2em 28px; } .content blockquote > p { - background-color: #191D1F; + background-color: #1c213a; padding: 13px 2em; color: #eee; } @media (max-width: 930px) { .toc-wrapper { - left: -230px; } + left: -231px; } .toc-wrapper.open { left: 0; } + .toc-wrapper .toc-navbar { + display: block; + background: #1c203b; + padding: 15px; } + .toc-wrapper .toc-navbar li a { + color: #fff; + text-decoration: none; + text-transform: uppercase; + font-weight: 600; } .page-wrapper { margin-left: 0; } #nav-button { @@ -794,4 +810,157 @@ html, body { color: #909090; } .highlight, .highlight .w { - background-color: #1E2224; } + background-color: #1c213a; } + +.navbar-container { + height: 70px; } + .navbar-container .navbar { + position: fixed !important; + width: 100% !important; + height: 70px; + background: #1c213a; + left: 0; + top: 0; + right: 0; + z-index: 5000; } + +.navbar { + width: 100%; + border-bottom: 1px solid rgba(0, 0, 0, 0.15); + background-color: #fff; + position: fixed; } + +nav { + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + position: absolute; + top: 0; + left: 0; + z-index: 2; } + nav .logo-container { + width: 100%; } + nav .logo { + height: 40px; + width: 150px; + margin: 15px auto; + background-repeat: no-repeat; + background-position: center center; + background-size: contain; + color: transparent; + text-shadow: none; + position: relative; } + nav li { + list-style: none !important; + color: #fff; + padding: 10px; + font-size: 12px; + letter-spacing: 1px; + font-weight: 700; + text-transform: uppercase; + text-decoration: none; } + +@media (min-width: 48em) { + nav { + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; } } + +@media (max-width: 930px) { + #nav-button { + display: block; } + .navbar { + padding-left: 0; } } + +@media (min-width: 48em) { + nav .logo-container { + width: auto; } } + +@media (min-width: 48em) { + nav .logo { + display: inline-block; + margin: 15px 0 0 15px; } } + +.caret { + margin-top: 4px; + margin-left: 4px; + display: inline-block; + width: 0; + height: 0; + vertical-align: top; + border-top: 4px solid #fff; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + content: ""; } + +nav li { + list-style: none !important; + color: #fff; + padding: 10px; + text-decoration: none; } + nav li > a:only-child:after { + content: ""; } + +nav ul { + padding: 0; + margin-top: 20px; + margin-right: 20px; + display: none; } + nav ul li { + list-style: none; + float: left; } + nav ul li a { + color: #fff; + padding: 10px; + text-decoration: none; } + nav ul li a:hover { + text-decoration: underline; } + nav ul li a.button { + color: #fff; + background-color: #0084ff; + margin-top: -15px; + text-decoration: none !important; } + nav ul li select { + padding: 5px 10px; + border: 1px solid #ddd; + border-radius: 1px; + background-color: #fff; } + nav ul li ul { + display: none; } + nav ul li:hover ul { + position: absolute; + z-index: 1000; + margin-top: 10px; + margin-left: 8px; + list-style: none; + display: list-item !important; + border-radius: 2px; + background-color: #fff; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.25); } + nav ul li:hover ul:before { + border-top: 1px solid #e3e3e3; + border-left: 1px solid #e3e3e3; + display: block; + position: absolute; + top: -6px; + left: 12px; + width: 10px; + height: 10px; + background-color: #fff; + content: ''; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + z-index: -1; } + nav ul li ul li a { + text-transform: none; + letter-spacing: 0; + color: #3e4552; + font-family: helvetica neue,Helvetica,Arial,sans-serif; + font-weight: 500; } + nav ul li:hover ul li { + padding-left: 0; + float: none; } + +@media (min-width: 48em) { + nav ul { + display: block; } } diff --git a/source/images/favico.ico b/source/images/favico.ico new file mode 100644 index 00000000..12886503 Binary files /dev/null and b/source/images/favico.ico differ diff --git a/source/images/logo.png b/source/images/logo.png index 24d21d0a..55d69b6e 100644 Binary files a/source/images/logo.png and b/source/images/logo.png differ diff --git a/source/layouts/layout.ejs b/source/layouts/layout.ejs index aabd2f78..c0977512 100644 --- a/source/layouts/layout.ejs +++ b/source/layouts/layout.ejs @@ -24,7 +24,7 @@ under the License. <%= current_page.data.title || "API Documentation" %> - + <%- favico() %> <%- stylesheet_link_tag('screen','screen') %> @@ -39,6 +39,18 @@ under the License. class="<%= current_page.page_classes %>" <% } %>data-languages="<%- language_array(current_page.data.language_tabs) %>"> +
+ +
NAV @@ -46,7 +58,13 @@ under the License.
- <%- logo_image_tag() %> + <% if (language_tabs.length>0) {%>
<% for (var lang in language_tabs) { %> @@ -65,38 +83,38 @@ under the License.
    <% } %>
    -
      - <% for (var h1 of toc_data(page_content)) { %> -
    • - <%= h1.content %> - <% if (h1.children && (h1.children.length > 0)) { %> -
        - <% for (var h2 of h1.children) { %> -
      • - <%= h2.content %> - <% if (h2.children && (h2.children.length > 0)) { %> -
          - <% for (var h3 of h2.children) { %> -
        • - <%= h3.content %> -
          • +
            + <% for (var h1 of toc_data(page_content)) { %> +
          • + <%= h1.content %> + <% if (h1.children && (h1.children.length > 0)) { %> +
              + <% for (var h2 of h1.children) { %> +
            • + <%= h2.content %> + <% if (h2.children && (h2.children.length > 0)) { %> + <% } %> -
            - <% } %> -
            • - <% } %> -
          - <% } %> - - <% } %> -
        -
    - <% if (current_page.data.toc_footers) { %> -
      - <% for (var footer in current_page.data.toc_footers) { %> -
    • <%- current_page.data.toc_footers[footer] %>
      • + + <% } %> +
    + <% } %> + <% } %> +
    + <% if (current_page.data.toc_footers) { %> + <% } %>
    diff --git a/source/stylesheets/_variables.scss b/source/stylesheets/_variables.scss index 76932618..2615fc2f 100644 --- a/source/stylesheets/_variables.scss +++ b/source/stylesheets/_variables.scss @@ -23,30 +23,32 @@ under the License. // BACKGROUND COLORS //////////////////// -$nav-bg: #2E3336 !default; -$examples-bg: #2E3336 !default; -$code-bg: #1E2224 !default; -$code-annotation-bg: #191D1F !default; -$nav-subitem-bg: #1E2224 !default; -$nav-active-bg: #0F75D4 !default; -$nav-active-parent-bg: #1E2224 !default; // parent links of the current section +$menu-bg: #1c213a !default; +$nav-bg: #f8f8f8 !default; +$nav-border: rgba(221,221,221,.5) !default; +$examples-bg: #272b4e !default; +$code-bg: #1c213a !default; +$code-annotation-bg: #1c213a !default; +$nav-subitem-bg: #f8f8f8 !default; +$nav-active-bg: #f8f8f8 !default; +$nav-active-parent-bg: #f8f8f8 !default; // parent links of the current section $lang-select-border: #000 !default; -$lang-select-bg: #1E2224 !default; -$lang-select-active-bg: $examples-bg !default; // feel free to change this to blue or something +$lang-select-bg: #272b4e !default; +$lang-select-active-bg: #444e88 !default; // feel free to change this to blue or something $lang-select-pressed-bg: #111 !default; // color of language tab bg when mouse is pressed -$main-bg: #F3F7F9 !default; +$main-bg: #ffffff !default; $aside-notice-bg: #8fbcd4 !default; $aside-warning-bg: #c97a7e !default; -$aside-success-bg: #6ac174 !default; +$aside-success-bg: rgba(76, 175, 80, 0.3) !default; $search-notice-bg: #c97a7e !default; // TEXT COLORS //////////////////// -$main-text: #333 !default; // main content text color -$nav-text: #fff !default; -$nav-active-text: #fff !default; -$nav-active-parent-text: #fff !default; // parent links of the current section +$main-text: #1b3a52 !default; // main content text color +$nav-text: rgba(27,58,82,.6) !default; +$nav-active-text: #142d5c !default; +$nav-active-parent-text: #142d5c !default; // parent links of the current section $lang-select-text: #fff !default; // color of unselected language tab text $lang-select-active-text: #fff !default; // color of selected language tab text $lang-select-pressed-text: #fff !default; // color of language tab text when mouse is pressed @@ -89,7 +91,7 @@ $phone-width: $tablet-width - $nav-width !default; // min width before reverting // OTHER //////////////////// $nav-footer-border-color: #666 !default; -$search-box-border-color: #666 !default; +$search-box-border-color: rgba(28, 32, 59, 0.25) !default; //////////////////////////////////////////////////////////////////////////////// diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss index 83da68cc..1cc37065 100644 --- a/source/stylesheets/screen.css.scss +++ b/source/stylesheets/screen.css.scss @@ -49,18 +49,23 @@ html, body { .toc-wrapper { transition: left 0.3s ease-in-out; - overflow-y: auto; overflow-x: hidden; position: fixed; z-index: 30; - top: 0; + top: 70px; left: 0; bottom: 0; width: $nav-width; background-color: $nav-bg; + border-right: 1px solid $nav-border; font-size: 13px; - font-weight: bold; + font-weight: 500; + // font-weight: bold; + + .toc-navbar { + display: none; + } // language selector for mobile devices .lang-selector { @@ -155,12 +160,16 @@ html, body { .toc-link.active { background-color: $nav-active-bg; color: $nav-active-text; + border-left: 4px solid $nav-active-text; + padding-left: $nav-padding - 4px; + font-weight: bold; } // this is parent links of the currently selected ToC entry .toc-link.active-parent { background-color: $nav-active-parent-bg; color: $nav-active-parent-text; + font-weight: bold; } .toc-list-h2 { @@ -174,10 +183,14 @@ html, body { font-size: 12px; } + .toc-h2.active { + padding-left: $nav-padding + $nav-indent - 4px; + } + .toc-footer { padding: 1em 0; margin-top: 1em; - border-top: 1px dashed $nav-footer-border-color; + // border-top: 1px dashed $nav-footer-border-color; li,a { color: $nav-text; @@ -225,7 +238,7 @@ html, body { position: fixed; top: 0; left: 0; - z-index: 100; + z-index: 10000; color: #000; text-decoration: none; font-weight: bold; @@ -273,7 +286,7 @@ html, body { .lang-selector { position: fixed; z-index: 50; - border-bottom: 5px solid $lang-select-active-bg; + border-bottom: 2px solid $lang-select-active-bg; } } @@ -351,9 +364,9 @@ html, body { padding-bottom: 0.5em; margin-bottom: $h1-margin-bottom; margin-top: 2em; - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; - background-color: #fdfdfd; + // border-top: 1px solid #ccc; + border-bottom: 1px solid rgba(204,204,204,.6); + background-color: #ffffff; } h1:first-child, div:first-child + h1 { @@ -366,7 +379,7 @@ html, body { font-size: 19px; margin-top: 4em; margin-bottom: 0; - border-top: 1px solid #ccc; + border-top: 1px solid rgba(204,204,204,.6); padding-top: 1.2em; padding-bottom: 1.2em; background-image: linear-gradient(to bottom, rgba(#fff, 0.2), rgba(#fff, 0)); @@ -558,13 +571,27 @@ html, body { @media (max-width: $tablet-width) { .toc-wrapper { - left: -$nav-width; + left: -$nav-width - 1px; &.open { left: 0; } + + .toc-navbar { + display: block; + background: #1c203b; + padding: $nav-padding; + + li a { + color: #fff; + text-decoration: none; + text-transform: uppercase; + font-weight: 600; + } + } } + .page-wrapper { margin-left: 0; } @@ -613,3 +640,188 @@ html, body { .highlight, .highlight .w { background-color: $code-bg; } +.navbar-container { + height: 70px; + .navbar { + position: fixed !important; + width: 100% !important; + height: 70px; + background: $menu-bg; + left: 0; + top: 0; + right: 0; + z-index: 5000; + } +} + +.navbar { + width: 100%; + border-bottom: 1px solid rgba(0, 0, 0, 0.15); + background-color: #fff; + position: fixed; +} + +nav { + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + position: absolute; + top: 0; + left: 0; + z-index: 2; + .logo-container { + width: 100%; + } + .logo { + height: 40px; + width: 150px; + margin: 15px auto; + background-repeat: no-repeat; + background-position: center center; + background-size: contain; + color: transparent; + text-shadow: none; + position: relative; + } + li { + list-style: none !important; + color: #fff; + padding: 10px; + font-size: 12px; + letter-spacing: 1px; + font-weight: 700; + text-transform: uppercase; + text-decoration: none; + } +} + +@media (min-width: 48em) { + nav { + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + } +} + +@media (max-width: 930px) { + #nav-button { + display: block; + } + .navbar { + padding-left: 0; + } +} + +@media (min-width: 48em) { + nav .logo-container { + width: auto; + } +} + +@media (min-width: 48em) { + nav .logo { + display: inline-block; + margin: 15px 0 0 15px; + } +} + +.caret { + margin-top: 4px; + margin-left: 4px; + display: inline-block; + width: 0; + height: 0; + vertical-align: top; + border-top: 4px solid #fff; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + content: ""; +} + +nav { + li { + > a:only-child:after { + content: ""; + } + list-style: none !important; + color: #fff; + padding: 10px; + text-decoration: none; + } + ul { + padding: 0; + margin-top: 20px; + margin-right: 20px; + display: none; + li { + list-style: none; + float: left; + a { + color: #fff; + padding: 10px; + text-decoration: none; + &:hover { + text-decoration: underline; + } + &.button { + color: #fff; + background-color: #0084ff; + margin-top: -15px; + text-decoration: none !important; + } + } + select { + padding: 5px 10px; + border: 1px solid #ddd; + border-radius: 1px; + background-color: #fff; + } + ul { + display: none; + } + &:hover ul { + position: absolute; + z-index: 1000; + margin-top: 10px; + margin-left: 8px; + list-style: none; + display: list-item !important; + border-radius: 2px; + background-color: #fff; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.25); + &:before { + border-top: 1px solid #e3e3e3; + border-left: 1px solid #e3e3e3; + display: block; + position: absolute; + top: -6px; + left: 12px; + width: 10px; + height: 10px; + background-color: #fff; + content: ''; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); + z-index: -1; + } + } + ul li a { + text-transform: none; + letter-spacing: 0; + color: #3e4552; + font-family: helvetica neue,Helvetica,Arial,sans-serif; + font-weight: 500; + } + &:hover ul li { + padding-left: 0; + float: none; + } + } + } +} + +@media (min-width: 48em) { + nav ul { + display: block; + } +} \ No newline at end of file