diff --git a/app/client.js b/app/client.js index 8bae0e8..3ebbe7e 100755 --- a/app/client.js +++ b/app/client.js @@ -49,7 +49,6 @@ if (typeof window !== "undefined") main(); // E X P O R T module.exports = exports = main; -// export default main(); diff --git a/app/components/markdown.js b/app/components/markdown.js index 8ba9542..89c314a 100644 --- a/app/components/markdown.js +++ b/app/components/markdown.js @@ -72,7 +72,7 @@ function partialFinder(markdownBody) { else { const partialFunction = require(path.join(__dirname, "..", `./components/${filename}.js`)); - if (filename === "glossary-toc") markdownBody = markdownBody.replace(partial, partialFunction); + if (filename === "glossary-toc") markdownBody = markdownBody.replace(partial, partialFunction.default); else markdownBody = markdownBody.replace(partial, `${partialFunction.default()}
`); } } diff --git a/app/sass/_layout.scss b/app/sass/_layout.scss index ab24440..b9a0294 100644 --- a/app/sass/_layout.scss +++ b/app/sass/_layout.scss @@ -51,6 +51,8 @@ h2, h3, h4, h5 { + font-weight: 600; + .header-anchor { display: none; } diff --git a/app/sass/bundle.scss b/app/sass/bundle.scss index 4cb369d..8e3ae00 100755 --- a/app/sass/bundle.scss +++ b/app/sass/bundle.scss @@ -1,37 +1,32 @@ @charset "utf-8"; -@import -"@lbry/color/lbry-color", +@import "@lbry/components/sass/"; +@import "init/markdown"; +@import "init/extends"; -"init/base", -"init/mixins", -"init/markdown", -"init/extends", +@import "type/inter"; -"type/inter", +@import "partials/animation"; +@import "partials/ecosystem"; +@import "partials/email-subscribe"; +@import "partials/feature-links"; +@import "partials/flash"; +@import "partials/footer"; +@import "partials/github-feed"; +@import "partials/glossary"; +@import "partials/link-grid"; +@import "partials/navigation"; +@import "partials/mission-statement"; +@import "partials/modal"; +@import "partials/pre"; -"partials/animation", -"partials/ecosystem", -"partials/email-subscribe", -"partials/feature-links", -"partials/flash", -"partials/footer", -"partials/github-feed", -"partials/glossary", -"partials/link-grid", -"partials/navigation", -"partials/mission-statement", -"partials/modal", -"partials/pre", +@import "layout"; -"layout", +@import "pages/api"; +@import "pages/contributing"; +@import "pages/documentation"; +@import "pages/home"; +@import "pages/page"; +@import "pages/playground"; -"pages/api", -"pages/contributing", -"pages/documentation", -"pages/home", -"pages/page", -"pages/playground", - -"plugins/prism" -; +@import "plugins/prism"; diff --git a/app/sass/init/_base.scss b/app/sass/init/_base.scss deleted file mode 100644 index cb10864..0000000 --- a/app/sass/init/_base.scss +++ /dev/null @@ -1,190 +0,0 @@ -// sass-lint:disable no-important - -html { - box-sizing: border-box; - text-rendering: optimizeLegibility; - - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; -} - -*, -*::before, -*::after { - margin: 0; padding: 0; - - box-sizing: inherit; - outline: 0 !important; -} - -a, -area, -button, -[role="button"], -input, -label, -select, -summary, -textarea { - touch-action: manipulation; // Remove touch delay on supported devices -} - -a { - color: currentColor; - text-decoration: none; -} - -*[readonly] { - cursor: not-allowed; -} - -textarea { - &:not([disabled]) { - resize: vertical; - } - - &[disabled] { - resize: none; - } -} - -button { - &:not(:disabled) { - cursor: pointer; - } -} - -button, -input, -select, -textarea { - border: none; - border-radius: 0; - font-family: inherit; - font-size: inherit; - - -moz-appearance: none; - -webkit-appearance: none; - - &:focus { - outline: none; - } -} - -input, -select, -textarea { - background-color: transparent; -} - -[type="button"], -[type="submit"] { - cursor: pointer; -} - -iframe { - border: none; -} - -img { - max-width: 100%; - font-size: 0; - - &::after { - width: 100%; height: 100%; - - background-color: $lbry-white; - background-image: url("/assets/media/images/missing.png"); - background-size: cover; - box-shadow: 0 0 1px 0 rgba($lbry-black, 0.3); - content: ""; - display: block; - } -} - -@media print { - // Intelligent print styles - pre, - blockquote { - border: 1px solid #999 !important; - page-break-inside: avoid !important; - } - - tr, - img { - page-break-inside: avoid !important; - } - - img { - max-width: 100% !important; - } - - @page { - margin: 0.5cm !important; - } - - p, - h2, - h3 { - orphans: 3 !important; - widows: 3 !important; - } - - h2, - h3 { - page-break-after: avoid !important; - } - - thead { - display: table-header-group !important; - } - - // Faster, more stable printing - * { - background: transparent !important; - color: #000 !important; - filter: none !important; - text-shadow: none !important; - } - - p { - a { - &[href]::after { // Show hypertext data for links and abbreviations - content: " (" attr(href) ")" !important; - } - - &[href^="javascript:"], - &[href^="#"] { - &::after { - content: "" !important; - } - } - } - - abbr { - &[title]::after { - content: " (" attr(title) ")" !important; - } - } - - a, - abbr { - text-decoration: underline !important; - word-wrap: break-word !important; - } - } -} - -input::-moz-focus-inner, -button::-moz-focus-inner { - display: none; -} - -// Get rid of yellow autofill background -input:-webkit-autofill { - -webkit-box-shadow: 0 0 0 1000px $lbry-white inset !important; - - &:focus { - outline: none; - } -} diff --git a/app/sass/init/_markdown.scss b/app/sass/init/_markdown.scss index 4a2ea35..ee0d709 100644 --- a/app/sass/init/_markdown.scss +++ b/app/sass/init/_markdown.scss @@ -160,12 +160,19 @@ } ol { - list-style-type: lower-roman; - padding-left: 1.6rem; + padding-left: 0.1rem; + + li { + list-style-type: lower-roman; + } } ul { - padding-left: 1.25rem; + padding-left: 0.25rem; + + li { + list-style-type: disc; + } } img { diff --git a/app/sass/init/_mixins.scss b/app/sass/init/_mixins.scss deleted file mode 100644 index d06652d..0000000 --- a/app/sass/init/_mixins.scss +++ /dev/null @@ -1,75 +0,0 @@ -@mixin center { - align-items: center; - display: inline-flex; - justify-content: center; -} - -@mixin clearfix { - clear: both; - content: ""; - display: block; -} - -@mixin ellipsis { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -@mixin font-mono { - font-family: "Input Mono", "Fira Mono", "Fira Code", "Courier New", monospace; -} - -@mixin font-sans { - font-family: "Inter UI", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; -} - -@mixin font-serif { - font-family: Georgia, serif; -} - -@mixin hide-text { - border: none; - color: transparent; - font: 0 / 0 a; - text-shadow: none; -} - -@mixin no-user-select { - user-select: none; - - -ms-user-select: none; - -moz-user-select: none; - -webkit-user-select: none; -} - -@mixin selection($background-color, $text-color) { - &::selection { - background-color: $background-color; - color: $text-color; - text-shadow: none; - } - - &::-moz-selection { - background-color: $background-color; - color: $text-color; - text-shadow: none; - } -} - -@mixin underline($text-color: $lbry-black, $whitespace-color: #fff) { - @include selection($text-color, $whitespace-color); - - background-image: linear-gradient($whitespace-color, $whitespace-color), linear-gradient($whitespace-color, $whitespace-color), linear-gradient($text-color, $text-color); - background-position: 0 88%, 100% 88%, 0 88%; - background-repeat: no-repeat, no-repeat, repeat-x; - background-size: 0.05rem 1px, 0.05rem 1px, 1px 1px; - box-decoration-break: clone; - display: inline; - text-decoration: none; - text-shadow: 0.03rem 0 $whitespace-color, -0.03rem 0 $whitespace-color, 0 0.03rem $whitespace-color, 0 -0.03rem $whitespace-color, 0.06rem 0 $whitespace-color, -0.06rem 0 $whitespace-color, 0.09rem 0 $whitespace-color, -0.09rem 0 $whitespace-color, 0.12rem 0 $whitespace-color, -0.12rem 0 $whitespace-color, 0.15rem 0 $whitespace-color, -0.15rem 0 $whitespace-color; - - @-moz-document url-prefix() { // sass-lint:disable-line empty-args - background-position: 0 90%, 100% 90%, 0 90%; - } -} diff --git a/app/sass/pages/_playground.scss b/app/sass/pages/_playground.scss index f3e18bd..11abee1 100644 --- a/app/sass/pages/_playground.scss +++ b/app/sass/pages/_playground.scss @@ -315,7 +315,10 @@ select, textarea { width: 100%; + border-top: none; + border-right: none; border-bottom: 2px solid; + border-left: none; &:not(:hover):not(:active) { border-color: $lbry-black; diff --git a/app/views/redirect.js b/app/views/redirect.js index 5f3dfc7..57465cc 100644 --- a/app/views/redirect.js +++ b/app/views/redirect.js @@ -45,9 +45,14 @@ export default (state, emit) => { // eslint-disable-line // below should be refactored into components let pageScript = ""; - if (partialPath === "glossary") pageScript = ""; - if (partialPath === "overview") pageScript = ""; - if (partialPath === "playground") pageScript = ""; + if (partialPath === "glossary") + pageScript = ""; + + if (partialPath === "overview") + pageScript = ""; + + if (partialPath === "playground") + pageScript = ""; return html`
diff --git a/package.json b/package.json index 34dfb60..994e9fe 100755 --- a/package.json +++ b/package.json @@ -42,23 +42,24 @@ }, "description": "Documentation for the LBRY protocol and associated projects", "devDependencies": { - "@babel/cli": "^7.1.5", - "@babel/core": "^7.1.6", - "@babel/plugin-external-helpers": "7.0.0", - "@babel/plugin-proposal-class-properties": "7.1.0", - "@babel/plugin-proposal-decorators": "7.1.6", - "@babel/plugin-proposal-export-namespace-from": "7.0.0", - "@babel/plugin-proposal-function-sent": "7.1.0", - "@babel/plugin-proposal-json-strings": "7.0.0", - "@babel/plugin-proposal-numeric-separator": "7.0.0", - "@babel/plugin-proposal-throw-expressions": "7.0.0", - "@babel/plugin-syntax-dynamic-import": "7.0.0", - "@babel/plugin-syntax-import-meta": "7.0.0", - "@babel/preset-env": "^7.1.6", + "@babel/cli": "^7.2.0", + "@babel/core": "^7.2.0", + "@babel/plugin-external-helpers": "7.2.0", + "@babel/plugin-proposal-class-properties": "7.2.0", + "@babel/plugin-proposal-decorators": "7.2.0", + "@babel/plugin-proposal-export-namespace-from": "7.2.0", + "@babel/plugin-proposal-function-sent": "7.2.0", + "@babel/plugin-proposal-json-strings": "7.2.0", + "@babel/plugin-proposal-numeric-separator": "7.2.0", + "@babel/plugin-proposal-throw-expressions": "7.2.0", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-syntax-import-meta": "7.2.0", + "@babel/preset-env": "^7.2.0", "@babel/register": "^7.0.0", "@inc/eslint-config": "^1.1.2", "@inc/sasslint-config": "^1.1.2", "@lbry/color": "^1.0.5", + "@lbry/components": "^1.3.1", "eslint": "^5.9.0", "husky": "^1.2.0", "nodemon": "^1.18.7", @@ -67,7 +68,7 @@ "sass-lint": "^1.12.1", "snazzy": "^8.0.0", "standardx": "^3.0.1", - "updates": "^5.4.2" + "updates": "^5.4.3" }, "engines": { "node": "10.2.x"