From 2bb6ac8da06ed6f68938e5fc59defcd221063569 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 25 Jan 2017 12:23:41 +0100 Subject: [PATCH] remove forestry related stuff (#90) * effectively reverses #76 --- .gitignore | 1 - README.md | 12 ---- _config.yml | 3 - .../fonts/NotoSans-Regular.ttf | Bin .../fonts/NotoSans-Regular.woff | Bin .../fonts/NotoSans-Regular.woff2 | Bin _src/_assets/styles/bigchain.scss | 4 ++ _src/_assets/styles/bigchain/_typography.scss | 3 + .../videos/northern-light.mp4 | Bin .../videos/northern-light.webm | Bin _src/_data/menus.yml | 59 +++++++++--------- _src/assets/css/bigchain.min.scss | 4 -- _src/assets/img/sprite.svg | 1 - assets/img/sprite.svg | 1 - forestryio/images/bigchainpartners.png | Bin 6247 -> 0 bytes gulpfile.js | 24 ++++++- package.json | 2 + 17 files changed, 62 insertions(+), 52 deletions(-) rename _src/{assets => _assets}/fonts/NotoSans-Regular.ttf (100%) rename _src/{assets => _assets}/fonts/NotoSans-Regular.woff (100%) rename _src/{assets => _assets}/fonts/NotoSans-Regular.woff2 (100%) rename _src/{assets => _assets}/videos/northern-light.mp4 (100%) rename _src/{assets => _assets}/videos/northern-light.webm (100%) delete mode 100644 _src/assets/css/bigchain.min.scss delete mode 100644 _src/assets/img/sprite.svg delete mode 100644 assets/img/sprite.svg delete mode 100644 forestryio/images/bigchainpartners.png diff --git a/.gitignore b/.gitignore index d291e31..91af54b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ Gemfile.lock .jekyll-metadata _dist .awspublish* -.sass-cache yarn.lock diff --git a/README.md b/README.md index 72f9f62..8374983 100644 --- a/README.md +++ b/README.md @@ -94,15 +94,3 @@ gulp build --production # deploy contents of /_dist to live gulp deploy --live ``` - - -## `_assets` & `assets`, WTF? - -Basically: - -- `_assets`: its content won't be copied over to generated site but handled by Gulp during build process. -- `assets`: its content is copied over to generated site and processed by Jekyll's assets pipeline - -The site avoids using Jekyll's builtin assets pipeline for various reasons and all assets are handled and compiled by Gulp during the build process. - -This has one important drawback: it limits the use of 3rd-party tools providing a UI for Jekyll-based sites cause all of those tools depend on a simple `jekyll serve` to show a preview of edited content. To work around that, the `assets` folder holds all assets which are merely copied, rather than processed (`fonts` & `videos`). As for the styles, the `css/` folder holds a collection file importing all our main styles. This file then gets processed by Jekyll's assets pipeline so at least styles work when doing a `jekyll serve`. Additionally, this `assets` folder holds a precompiled sprite sheet of the interface assets. diff --git a/_config.yml b/_config.yml index 29bc353..92067e4 100644 --- a/_config.yml +++ b/_config.yml @@ -59,9 +59,6 @@ redcarpet: source: ./_src destination: ./_dist -sass: - sass_dir: _assets/styles - # Plugins # -------------------- diff --git a/_src/assets/fonts/NotoSans-Regular.ttf b/_src/_assets/fonts/NotoSans-Regular.ttf similarity index 100% rename from _src/assets/fonts/NotoSans-Regular.ttf rename to _src/_assets/fonts/NotoSans-Regular.ttf diff --git a/_src/assets/fonts/NotoSans-Regular.woff b/_src/_assets/fonts/NotoSans-Regular.woff similarity index 100% rename from _src/assets/fonts/NotoSans-Regular.woff rename to _src/_assets/fonts/NotoSans-Regular.woff diff --git a/_src/assets/fonts/NotoSans-Regular.woff2 b/_src/_assets/fonts/NotoSans-Regular.woff2 similarity index 100% rename from _src/assets/fonts/NotoSans-Regular.woff2 rename to _src/_assets/fonts/NotoSans-Regular.woff2 diff --git a/_src/_assets/styles/bigchain.scss b/_src/_assets/styles/bigchain.scss index fe8c0f7..45020fe 100644 --- a/_src/_assets/styles/bigchain.scss +++ b/_src/_assets/styles/bigchain.scss @@ -4,6 +4,10 @@ // bigchain.io // +// Normalize all the things +@import '../../../node_modules/normalize-css/normalize'; +@import '../../../node_modules/normalize-opentype.css/normalize-opentype.scss'; + // Variables & Mixins @import 'bigchain/_variables'; @import 'bigchain/_mixins'; diff --git a/_src/_assets/styles/bigchain/_typography.scss b/_src/_assets/styles/bigchain/_typography.scss index c4313a0..b49a57d 100644 --- a/_src/_assets/styles/bigchain/_typography.scss +++ b/_src/_assets/styles/bigchain/_typography.scss @@ -34,6 +34,9 @@ body { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -moz-font-feature-settings: 'liga', 'kern'; + + // remove old style numerals + font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 0, "lnum" 0, "dlig" 1; } // Reset fonts for relevant elements diff --git a/_src/assets/videos/northern-light.mp4 b/_src/_assets/videos/northern-light.mp4 similarity index 100% rename from _src/assets/videos/northern-light.mp4 rename to _src/_assets/videos/northern-light.mp4 diff --git a/_src/assets/videos/northern-light.webm b/_src/_assets/videos/northern-light.webm similarity index 100% rename from _src/assets/videos/northern-light.webm rename to _src/_assets/videos/northern-light.webm diff --git a/_src/_data/menus.yml b/_src/_data/menus.yml index 5b5e85f..c987fc6 100644 --- a/_src/_data/menus.yml +++ b/_src/_data/menus.yml @@ -1,33 +1,36 @@ --- main: -- title: How it works - url: "/features/" -- title: Whitepaper - url: "/whitepaper/" -- title: Community - url: "/community/" -- title: Docs - url: https://docs.bigchaindb.com/ + - title: How it works + url: "/features/" + - title: Whitepaper + url: "/whitepaper/" + - title: Community + url: "/community/" + - title: Docs + url: https://docs.bigchaindb.com/ + secondary: -- title: About - url: "/about/" -- title: Contact - url: "/contact/" -- title: Blog - url: https://blog.bigchaindb.com + - title: About + url: "/about/" + - title: Contact + url: "/contact/" + - title: Blog + url: https://blog.bigchaindb.com + community: -- title: GitHub - url: https://github.com/bigchaindb -- title: Twitter - url: https://twitter.com/BigchainDB -- title: Gitter - url: https://gitter.im/bigchaindb/bigchaindb + - title: GitHub + url: https://github.com/bigchaindb + - title: Twitter + url: https://twitter.com/BigchainDB + - title: Gitter + url: https://gitter.im/bigchaindb/bigchaindb + legal: -- title: Terms - url: "/terms/" -- title: Privacy - url: "/privacy/" -- title: Contributor Agreement - url: "/cla/" -- title: Imprint - url: "/imprint/" + - title: Terms + url: "/terms/" + - title: Privacy + url: "/privacy/" + - title: Contributor Agreement + url: "/cla/" + - title: Imprint + url: "/imprint/" diff --git a/_src/assets/css/bigchain.min.scss b/_src/assets/css/bigchain.min.scss deleted file mode 100644 index 8e8b684..0000000 --- a/_src/assets/css/bigchain.min.scss +++ /dev/null @@ -1,4 +0,0 @@ ---- ---- - -@import "bigchain"; diff --git a/_src/assets/img/sprite.svg b/_src/assets/img/sprite.svg deleted file mode 100644 index ce74b97..0000000 --- a/_src/assets/img/sprite.svg +++ /dev/null @@ -1 +0,0 @@ -gitterstacksstack-traditional \ No newline at end of file diff --git a/assets/img/sprite.svg b/assets/img/sprite.svg deleted file mode 100644 index ce74b97..0000000 --- a/assets/img/sprite.svg +++ /dev/null @@ -1 +0,0 @@ -gitterstacksstack-traditional \ No newline at end of file diff --git a/forestryio/images/bigchainpartners.png b/forestryio/images/bigchainpartners.png deleted file mode 100644 index f05f20641f3817e0177077dfc04166b1b5eeb155..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6247 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.3.1", + "normalize-opentype.css": ">=0.2.4", "parsleyjs": "^2.0.7", "svg4everybody": "^2.0.0", "vivus": "^0.2.2",