diff --git a/.travis.yml b/.travis.yml index d6c3d3d..a65074d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ # # [References] # Travis CI Documentation -# (https://docs.travis-ci.com) +# (https://docs.travis-ci.com/user/languages/javascript-with-nodejs) language: node_js node_js: - "6" diff --git a/CHANGELOG.md b/CHANGELOG.md index aaa36f5..1a14631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ --- +# 0.1.1 +*2017-02-21* +## Improvements +### Continuous Integration Builds +❯ [Circle CI](https://circleci.com/gh/arcticicestudio/nord-hyper) builds are running against the latest [Node](https://nodejs.org) `6.x.x` version now +❯ [Travis-CI](https://travis-ci.org/arcticicestudio/nord-hyper) builds are running against the latest [Node](https://nodejs.org) `6.x.x` and `4.x.x` versions now + +## Bug Fixes +❯ Fixed the order of the `cursorShape`, `fontSize` and `fontFamily` configuration attributes to prevent overriding of the defined `~/.hyper.js` user configs with the theme defaults. (@kepbod, #2 #3, 45e8e9c3) + +### Documentation +❯ Fixed the keymaps to open- and reload the `~/.hyper.js` config file. (@kepbod, #2, d1604716) + # 0.1.0 *2017-02-19* **Initial npm module release version!** diff --git a/README.md b/README.md index f78ddec..1cfd8d1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,13 @@ plugins: [ 'nord-hyper' ] ``` -The configuration file can be opened with `⌘ +` and reloaded with `⌘ ⇧ R`. +The configuration file can be opened with + - `⌘ + ,` + - `Ctrl + ,` + +and reloaded with + - `⌘ ⇧ R` + - `Ctrl ⇧ R` #### hpm Install `nord-hyper` from the command line: @@ -34,7 +40,7 @@ hpm install nord-hyper

Non-obtrusive cursor blinking.

## Development -[![](https://img.shields.io/badge/Changelog-0.1.0-81A1C1.svg)](https://github.com/arcticicestudio/nord-hyper/blob/v0.1.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg)](https://github.com/arcticicestudio/arcver) +[![](https://img.shields.io/badge/Changelog-0.1.1-81A1C1.svg)](https://github.com/arcticicestudio/nord-hyper/blob/v0.1.1/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg)](https://github.com/arcticicestudio/arcver) Continuous integration builds are running at [Travis-CI](https://travis-ci.org/arcticicestudio/nord-hyper) and [Circle CI](https://circleci.com/gh/arcticicestudio/nord-hyper). diff --git a/circle.yml b/circle.yml index e81f502..02f08dc 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,8 @@ # # [References] # Circle CI -# (https://circleci.com/docs) +# (https://circleci.com/docs/language-nodejs) +# (https://circleci.com/docs/yarn) machine: node: version: 6 diff --git a/index.js b/index.js index 04d67e8..699aad0 100644 --- a/index.js +++ b/index.js @@ -60,9 +60,9 @@ exports.decorateConfig = config => { borderColor, cursorColor: cursorColor, colors, - cursorShape: "BEAM", + cursorShape: config.cursorShape || "BEAM", fontSize: config.fontSize || 16, - fontFamily: "'Source Code Pro', Hack" || config.fontFamily, + fontFamily: config.fontFamily || "'Source Code Pro', Hack", termCSS: ` ${config.termCSS || ""} ::selection { diff --git a/package.json b/package.json index 63d64f7..b5ff41c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nord-hyper", "title": "Nord Hyper", - "version": "0.1.0", + "version": "0.1.1", "description": "A arctic, north-bluish clean and elegant Hyper theme plugin", "author": { "name": "Arctic Ice Studio",