Skip to content

Commit

Permalink
Merge branch 'release/0.2.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
arcticicestudio committed Feb 21, 2017
2 parents b2fad4e + 839cfed commit c89e2ef
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 9 deletions.
26 changes: 22 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-terminix/develop/src/assets/nord-terminix-banner.svg"/></p>

<p align="center"><img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-terminix/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-terminix.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.1.0"><img src="https://img.shields.io/badge/Nord-v0.1.0-blue.svg"/></a></p>
<p align="center"><img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-terminix/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-terminix.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-88C0D0.svg"/></a> <a href="https://gnunn1.github.io/terminix-web"><img src="https://img.shields.io/badge/Terminix-v1.5.0+-4C566A.svg"/></a></p>

---

# 0.1.0 (2016-11-19)
# 0.2.0
*2017-02-21*
## Features
Implemented the main JSON color scheme file.
❯ Implemented support for advanced color settings including [badges](https://gnunn1.github.io/terminix-web/manual/badges). Disabled by default to allow users to enable them when they fit their needs. (@arcticicestudio, #9, cdf1c580)

<p align="center"><strong>Advanced Color Settings</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-feature-advanced-settings.png"/><br><strong>Badges</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-feature-advanced-settings-badges.png"/></p>

## Improvements
### Toolbox
❯ Implemented a [`gulpfile.js`](https://github.com/arcticicestudio/nord-terminix/blob/develop/gulpfile.js) to run ESLint with defined [`.eslintrc.js`](https://github.com/arcticicestudio/nord-terminix/blob/develop/.eslintrc.js) rules. (@arcticicestudio, #10, 1b92f2f2)

### Continuous Integration Builds
[Circle CI](https://circleci.com/gh/arcticicestudio/nord-terminix) builds are now running against the latest [Node](https://nodejs.org) `6.x.x` version (@arcticicestudio, #10, 1b92f2f2)
[Travis-CI](https://travis-ci.org/arcticicestudio/nord-terminix) builds are now running against the latest [Node](https://nodejs.org) `6.x.x` and `4.x.x` versions (@arcticicestudio, #10, 1b92f2f2)
❯ Added support for [EditorConfig](http://editorconfig.org) by defining rules via a [`.editorconfig`](https://github.com/arcticicestudio/nord-terminix/blob/develop/.editorconfig) file. (@arcticicestudio, #11, 748ac20c)

# 0.1.0
*2016-11-19*
## Features
❯ Implemented the main JSON color scheme file.
Detailed instructions to install the scheme file can be found in the [README](https://github.com/arcticicestudio/nord-terminix/blob/develop/README.md#installation).
(@arcticicestudio, #1, b4179195)

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-colortest.png"/><br><strong>htop</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-htop.png"/></p>

# 0.0.0 (2016-11-19)
# 0.0.0
*2016-11-19*
**Project Initialization**
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-terminix/develop/src/assets/nord-terminix-banner.svg"/></p>

<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-terminix"><img src="https://img.shields.io/travis/arcticicestudio/nord-terminix/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-terminix"><img src="https://circleci.com/gh/arcticicestudio/nord-terminix.svg?style=shield&circle-token=eaf4cf0919257aeeb77fde037ea2274a9524d6b4"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-terminix/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-terminix.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.1.0"><img src="https://img.shields.io/badge/Nord-v0.1.0-blue.svg"/></a></p>
<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-terminix"><img src="https://img.shields.io/travis/arcticicestudio/nord-terminix/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-terminix"><img src="https://circleci.com/gh/arcticicestudio/nord-terminix.svg?style=shield&circle-token=eaf4cf0919257aeeb77fde037ea2274a9524d6b4"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-terminix/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-terminix.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-v0.2.0-88C0D0.svg"/></a> <a href="https://gnunn1.github.io/terminix-web"><img src="https://img.shields.io/badge/Terminix-v1.5.0+-4C566A.svg"/></a></p>

<p align="center">A arctic, north-bluish clean and elegant <a href="https://gnunn1.github.io/terminix-web">Terminix</a> color scheme.</p>

Expand All @@ -16,7 +16,7 @@ Based on the <a href="https://github.com/arcticicestudio/nord">Nord</a> color pa
#### Manual
Copy the [`nord.json`](https://github.com/arcticicestudio/nord-terminix/blob/develop/src/json/nord.json) file to the color schemes directory according to the desired installation type.

Local: `~/.config/terminix/schemes`
Local: `~/.config/terminix/schemes`
Global: `/usr/share/terminix/schemes`

#### Install Script
Expand Down Expand Up @@ -46,8 +46,10 @@ Syntax: `install.sh [OPTIONS]`
## Screenshots
<p align="center"><strong>htop</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-htop.png"/></p>

<p align="center"><strong>Advanced Color Settings</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-feature-advanced-settings.png"/><br><strong>Badges</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-feature-advanced-settings-badges.png"/></p>

## Development
[![](https://img.shields.io/badge/Changelog-0.1.0-blue.svg)](https://github.com/arcticicestudio/nord-terminix/blob/v0.1.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver)
[![](https://img.shields.io/badge/Changelog-0.2.0-81A1C1.svg)](https://github.com/arcticicestudio/nord-terminix/blob/v0.2.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)

Continuous integration builds are running at [Travis-CI](https://travis-ci.org/arcticicestudio/nord-terminix) and [Circle CI](https://circleci.com/bb/arcticicestudio/nord-terminix).

Expand All @@ -58,4 +60,4 @@ Please report issues/bugs, feature requests and suggestions for improvements to

<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2016 Arctic Ice Studio</p>

<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-blue.svg"/></a></p>
<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-5E81AC.svg"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-5E81AC.svg"/></a></p>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nord-terminix",
"title": "Nord Terminix",
"version": "0.1.0",
"version": "0.2.0",
"description": "A arctic, north-bluish clean and elegant Terminix color scheme.",
"author": {
"name": "Arctic Ice Studio",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/scrot-feature-advanced-settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c89e2ef

Please sign in to comment.