Merge pull request #85 from 47deg/markdown-code-highlight-issues

Highlight JS Autodetect Issues

.travis.yml

@@ -2,11 +2,9 @@ language: scala
 scala:
 - 2.10.6
 before_install:
-- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_0d40c3508e9d_key -iv $encrypted_0d40c3508e9d_iv
-  -in keys.tar.enc -out keys.tar -d; tar xvf keys.tar; fi
+- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash
+  scripts/decrypt-keys.sh; fi
 - export PATH=${PATH}:./vendor/bundle
-- chmod 600 deploy_key
-- cp deploy_key ~/.ssh/id_rsa
 install:
 - rvm use 2.2.3 --install --fuzzy
 - gem update --system

docs/src/main/tut/docs/settings.md

@@ -88,6 +88,14 @@ micrositeImgDirectory := (resourceDirectory in Compile).value / "site" / "images
 micrositeCssDirectory := (resourceDirectory in Compile).value / "site" / "styles"
 ```
 
+- `micrositeJsDirectory`: you can also introduce custom javascript files in the generated microsite through the `micrositeJsDirectory` setting, by using the same method. The javascript files in that folder will be automatically copied and imported by the plugin in your microsite. The default value is `(resourceDirectory in Compile).value / "microsite" / "js"` but you can override it like this:
+
+```
+micrositeJsDirectory := (resourceDirectory in Compile).value / "site" / "scripts"
+```
+
+There is a reserved filename that you cannot use in your personal microsite: `main.js`, which it's provided by the plugin.
+
 - `micrositeDataDirectory`: in addition, you can provide new data to your jekyll site through the `micrositeDataDirectory` setting. It's based on the idea of [Jekyll Data Files](https://jekyllrb.com/docs/datafiles/). It's important to keep in mind that if you are defining documentation in your microsite, you have to configure the menu through this setting. The default value is `(resourceDirectory in Compile).value / "microsite" / "data"` but you can override it like this:
 
 ```

scripts/decrypt-keys.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+openssl aes-256-cbc -K $encrypted_0d40c3508e9d_key -iv $encrypted_0d40c3508e9d_iv -in keys.tar.enc -out keys.tar -d;
+tar xvf keys.tar;
+chmod 600 deploy_key;
+cp deploy_key ~/.ssh/id_rsa;