fix(merge conflicts): fixes all merge conflicts and merges develop into master

Author: Fabian Morón Zirfas

.netlify/state.json

@@ -0,0 +1,3 @@
+{
+	"siteId": "c081644c-312b-486e-8594-8bb5c3a869ca"
+}

.node-version

@@ -0,0 +1 @@
+10.15.3

.nvmrc

@@ -0,0 +1 @@
+v10.15.3

.travis.yml

@@ -1,3 +1,16 @@
 language: node_js
+cache: npm
 node_js:
-  - stable
+  - lts/*
+before_install:
+  - rvm install 2.6.0
+
+install:
+  - npm ci
+  - bundle install
+
+script:
+  - npm t
+  - npm run build:api-markup
+  - npm run webpack:prod
+  - bundle exec jekyll build

.vscode/settings.json

@@ -1,2 +1,29 @@
 {
+<<<<<<< HEAD
+=======
+  "workbench.colorCustomizations": {
+    "activityBar.background": "#6ca2ee",
+    "activityBar.foreground": "#15202b",
+    "activityBar.inactiveForeground": "#15202b99",
+    "activityBarBadge.background": "#c81761",
+    "activityBarBadge.foreground": "#e7e7e7",
+    "titleBar.activeBackground": "#3e85e9",
+    "titleBar.inactiveBackground": "#3e85e999",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.inactiveForeground": "#e7e7e799",
+    "statusBar.background": "#3e85e9",
+    "statusBarItem.hoverBackground": "#6ca2ee",
+    "statusBar.foreground": "#e7e7e7"
+  },
+  "peacock.color": "#3e85e9",
+  "spellright.language": [
+    "en",
+    "de"
+  ],
+  "spellright.documentTypes": [
+    "markdown",
+    "latex",
+    "plaintext"
+  ]
+>>>>>>> develop
 }

README.md

@@ -1,40 +1,98 @@
 # Basil.js
 
-[![Build Status](https://travis-ci.org/basiljs/basiljs.github.io.svg?branch=master)](https://travis-ci.org/basiljs/basiljs.github.io)
+[![Build Status](https://travis-ci.org/basiljs/basiljs.github.io.svg?branch=master)](https://travis-ci.org/basiljs/basiljs.github.io) [![Netlify Status](https://api.netlify.com/api/v1/badges/c081644c-312b-486e-8594-8bb5c3a869ca/deploy-status)](https://app.netlify.com/sites/basiljs2/deploys)
+
+Hosted on:  
+
+[![Netlify Badge](https://www.netlify.com/img/global/badges/netlify-color-accent.svg)](https://basiljs2.netlify.com/)
 
 This repo holds the [site/docs for Basil.js](https://basiljs.github.io/). The current state of development (develop branch) can be found here [basiljs2.netlify.com](https://basiljs2.netlify.com/)
+## Update Basil API  
+
+If there are changes to the API of Basil.js you can update the data on this repo as follows.  
+
+```bash
+
+git pull [email protected]:basiljs/basiljs.github.io.git
+cd basiljs.github.io
+# get all branches
+git fetch -a
+# get into the develop branch
+git checkout -b develop origin/develop
+# now make your new branch based on develop
+git checkout -b chore/update-docs
+# build the new data source for the site
+# This will:  
+
+# - Pull the Basil.js' branch `develop` with npm from GitHub (eventually this should be the master, not the develop branch).
+# - Generate the file `./build-scripts/api/data.json` from `./node_modules/basiljs/basil.js` using [documentation.js](http://documentation.js.org/).
+# - Generate the following files for the index.
+#    + `./_data/categories.json`
+#    + `./_data/cats-and-subcats.json`
+# - Also generate all the files for the subpages of `_source/reference`.  
+npm run build:api-markup
+# After that you can just commit all the changes and push it the repo again. Netlify will take care of the Jekyll build.  
+# Only add the files you really want to.
+# Adding all with `git add .` is acutally not the right way
+# use gits interactive mode or some more specific paths then `.`
+git add -i
+git commit -m "chore: Update Basil.js api to latest state [Add your favorite emoji here]"
+# push current HEAD to remote
+git push -u origin HEAD
+# Now go to the GitHub UI and create your PR
+```
 
-## Deploy  
+This repo holds the [site/docs for Basil.js](https://basiljs.github.io/). The current state of development (develop branch) can be found here [basiljs2.netlify.com](https://basiljs2.netlify.com/)
 
-If there are some changed to the API of Basil.js you can update the data on this repo as follows.  
+## Development
 
-    npm run build
+To build these docs we are using [Webpack](https://webpack.js.org/) and [Jekyll](https://jekyllrb.com/). You need both of these to develop on this.  
 
-This will:  
+- Create a new branch based on branch `develop` (see the code above for a how to 👆).
+- Do your thing
+- Create a pull request against develop
 
-- Pull the branch develop with npm from GitHub.
-- Generate the file `./.bin/api/data.json` from `./node_modules/basiljs/basil.js` using [documentation.js](http://documentation.js.org/).
-- Generate the following files for the index.
-    + `./_data/categories.json`
-    + `./_data/cats-and-subcats.json`
-- Also generate all the files for the subpages.  
+Netlify will create a branch and deploy preview for you and you can see your changes online. Every push to your branch will trigger a new build and will be linked on the PR page.
 
-After that you can just commit all the changes and push it the repo again. GitHub pages will take care of the jekyll build.  
+To develop locally take a look at the steps below. 👇
 
+### Markup + SCSS
 
-## Development
+Most of the Jekyll [liquid magic](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers) happens in `./_source`.  
 
-To build these docs we are using [Node.js](https://nodejs.org/en/) and [Jekyll](https://jekyllrb.com/). You need both of them installed to develop on this.  
+To develop in this run:
 
-In the `.bin/` folder you have the scripts to generate the files for the reference. The entry point is `index.js`.  
+```bash
+# once
+bundle install
+bundle update
+# whenever you want to work on the markup/content
+# (the --limit_posts 1 --incremental flags are needed
+# because we have lots of pages and need to speedup the build)
+bundle exec jekyll serve --livereload --limit_posts 1 --incremental
+```
 
-Most of the jekyll [liquid magic](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers) happens in `./index.html`, `_includes/entry-card.html`.  
+### Javascript
 
-To develop in this run:
+To work on the Javasscript of the site you need to run
+
+```bash
+# once
+# needs npm v5.7 or higer
+npm ci
+# when you develop on it
+# (starts the webpack dev watch build toolchain)
+npm run webpack:dev
+```
+
+## Recipes
+
+Resize and crop multiple images using [`mogrify`](https://www.imagemagick.org/script/mogrify.php)  
+
+```bash
+mogrify -resize 320x180^ -gravity Center -extent 320x180 -quality 100 -format png ./*/thumbnail.jpg
 
-    bundle install
-    bundle update
-    bundle exec jekyll serve --livereload
+```
 
 ## License
 

_source/_data/cats-and-subcats.json

@@ -7721,7 +7721,7 @@
         },
         {
           "name": "Vector.dot",
-          "description": "Static function. Calculates the dot product of two vectors. Is meant to be called \"static\" i.e. `Vector.dot(v1, v2);`",
+          "description": "Calculates the dot product from this vector to another as `x`, `y`, and `z` components or full vector.",
           "returns": {
             "name": null,
             "description": "The dot product.",
@@ -7733,45 +7733,50 @@
           "subcategory": "Vector",
           "parameters": [
             {
-              "name": "v1",
-              "description": "The first vector.",
+              "name": "v",
+              "description": "Either a full vector or an `x` component.",
               "optional": false,
               "type": [
-                "Vector"
+                "Vector",
+                "Number"
               ]
             },
             {
-              "name": "v2",
-              "description": "The second vector.",
-              "optional": false,
+              "name": "y",
+              "description": "The `y` component.",
+              "optional": true,
               "type": [
-                "Vector"
+                "Number"
+              ]
+            },
+            {
+              "name": "z",
+              "description": "The `z` component.",
+              "optional": true,
+              "type": [
+                "Number"
               ]
             }
           ],
           "kind": "function",
           "tags": [
             {
               "title": "summary",
-              "description": "Calculates the dot product of two vectors."
+              "description": "Calculates the dot product from this vector to another."
             },
             {
               "title": "description",
-              "description": "Static function. Calculates the dot product of two vectors. Is meant to be called \"static\" i.e. `Vector.dot(v1, v2);`"
-            },
-            {
-              "title": "static",
-              "description": null
+              "description": "Calculates the dot product from this vector to another as `x`, `y`, and `z` components or full vector."
             }
           ],
           "examples": [],
           "todo": null,
-          "summary": "Calculates the dot product of two vectors.",
-          "codetitle": "Vector.dot(v1, v2)"
+          "summary": "Calculates the dot product from this vector to another.",
+          "codetitle": "Vector.dot(v, [y], [z])"
         },
         {
           "name": "Vector.dot",
-          "description": "Calculates the dot product from this vector to another as `x`, `y`, and `z` components or full vector.",
+          "description": "Static function. Calculates the dot product of two vectors. Is meant to be called \"static\" i.e. `Vector.dot(v1, v2);`",
           "returns": {
             "name": null,
             "description": "The dot product.",
@@ -7783,46 +7788,41 @@
           "subcategory": "Vector",
           "parameters": [
             {
-              "name": "v",
-              "description": "Either a full vector or an `x` component.",
+              "name": "v1",
+              "description": "The first vector.",
               "optional": false,
               "type": [
-                "Vector",
-                "Number"
-              ]
-            },
-            {
-              "name": "y",
-              "description": "The `y` component.",
-              "optional": true,
-              "type": [
-                "Number"
+                "Vector"
               ]
             },
             {
-              "name": "z",
-              "description": "The `z` component.",
-              "optional": true,
+              "name": "v2",
+              "description": "The second vector.",
+              "optional": false,
               "type": [
-                "Number"
+                "Vector"
               ]
             }
           ],
           "kind": "function",
           "tags": [
             {
               "title": "summary",
-              "description": "Calculates the dot product from this vector to another."
+              "description": "Calculates the dot product of two vectors."
             },
             {
               "title": "description",
-              "description": "Calculates the dot product from this vector to another as `x`, `y`, and `z` components or full vector."
+              "description": "Static function. Calculates the dot product of two vectors. Is meant to be called \"static\" i.e. `Vector.dot(v1, v2);`"
+            },
+            {
+              "title": "static",
+              "description": null
             }
           ],
           "examples": [],
           "todo": null,
-          "summary": "Calculates the dot product from this vector to another.",
-          "codetitle": "Vector.dot(v, [y], [z])"
+          "summary": "Calculates the dot product of two vectors.",
+          "codetitle": "Vector.dot(v1, v2)"
         },
         {
           "name": "Vector.get",

_source/_includes/aside-left.html

@@ -1,27 +1,36 @@
 <aside>
-  <a href="/"><div class="logo" id="logo"></div></a>
-  <div class="nav-o-meter"><ul class="bars"><li></li><li></li><li></li></ul></div>
+  <a href="/">
+    <div class="logo" id="logo"></div>
+  </a>
+  <div class="nav-o-meter">
+    <ul class="bars">
+      <li></li>
+      <li></li>
+      <li></li>
+    </ul>
+  </div>
   <nav class="main-menu">
-      <ul>
-        <!--
+    <ul>
+      <!--
         loop all pages
         exclude all entry layouts
         include  all default and the reference
         exclude the root path
         -->
       {% assign pages = site.pages | sort: 'order'  %}
       {% for item in pages %}{% if item.layout != 'entry' %}{%if item.layout == 'default' or item.layout == 'reference' %}{% if item.url != '/' %}
-        <li class="menu-item {% if item.title == page.title %}active{% endif %}"><a href="{{item.url}}" class="textgrow menu-link">{{item.title}}</a></li>
-            {% endif %}{% endif %}{% endif %}{% endfor %}
+      <li class="menu-item {% if item.title == page.title %}active{% endif %}"><a href="{{item.url}}"
+          class="textgrow menu-link">{{item.title}}</a></li>
+      {% endif %}{% endif %}{% endif %}{% endfor %}
 
-      </ul>
-      <div class="tweet">
-        <div class="message"></div>
-        <div class="tweettime"></div>
-        <div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow menu-link">@basil_js</a></div>
-      </div>
-    </nav>
-        <div class="fhnw-logo">
-          <a href="http://www.fhnw.ch/hgk/ivk"><img src="/assets/images/fhnwlogo.png" alt="FHNW logo and link"></a>
-        </div>
+    </ul>
+    <div class="tweet">
+      <div class="message"></div>
+      <div class="tweettime"></div>
+      <div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow menu-link">@basil_js</a></div>
+    </div>
+    <div class="fhnw-logo">
+      <a href="https://www.fhnw.ch/hgk/ivk"><img src="/assets/images/fhnwlogo.png" alt="FHNW logo and link"></a>
+    </div>
+  </nav>
 </aside>