Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
arcticicestudio committed Feb 21, 2017
2 parents 81c35a9 + 839cfed commit faa8fe4
Show file tree
Hide file tree
Showing 13 changed files with 1,955 additions and 36 deletions.
18 changes: 18 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# ++++++++++++++++++++++
# + Base Configuration +
# ++++++++++++++++++++++
[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 160
trim_trailing_whitespace = true

# +++++++++++++
# + Languages +
# +++++++++++++
# +++ Markdown +++
[*.{md,gfm}]
trim_trailing_whitespace = false
73 changes: 73 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title ESLint Configuration +
project nord-terminix +
repository https://github.com/arcticicestudio/nord-terminix +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2017 +
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
[References]
ESLint
http://eslint.org/docs/user-guide/configuring
http://eslint.org/docs/user-guide/configuring#using-configuration-files
http://eslint.org/docs/user-guide/configuring#specifying-environments
http://eslint.org/docs/user-guide/configuring#configuring-plugins
http://eslint.org/docs/rules
*/
module.exports = {
"env": {
"node": true,
"es6": true,
"browser": true
},
"plugins": ["json"],
"parserOptions": {
"ecmaVersion": 6,
"ecmaFeatures": {
"jsx": true
}
},
"extends": [
"eslint:recommended"
],
"rules": {
// Style Guide
"array-bracket-spacing": ["error", "never"],
"comma-dangle": ["error", "never"],
"curly":["error", "all"],
"func-call-spacing": ["error", "never"],
"indent": ["error", 2],
"linebreak-style": ["error", "unix"],
"no-duplicate-imports": "error",
"no-tabs": "error",
"no-var": "error",
"quotes": ["error", "double"],
"semi": ["error", "always"],
// Error Prevention
"no-cond-assign": ["error", "always"],
"no-console": "off",
// Code Performance
"global-require": "warn",
// Documentation
"require-jsdoc": ["warn", {
"require": {
"FunctionDeclaration": true,
"MethodDefinition": false,
"ClassDeclaration": true,
"ArrowFunctionExpression": false
}
}],
"valid-jsdoc": ["error", {
"prefer": {
"arg": "param",
"argument": "param",
"class": "constructor",
"virtual": "abstract"
},
"requireParamDescription": true,
"requireReturnDescription": true
}]
}
}
5 changes: 0 additions & 5 deletions .eslintrc.json

This file was deleted.

17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@
# repository https://github.com/arcticicestudio/nord-terminix +
# author Arctic Ice Studio +
# email development@arcticicestudio.com +
# copyright Copyright (C) 2016 +
# copyright Copyright (C) 2017 +
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [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"
cache:
directories:
- $HOME/node_modules
node_js:
- "6"
- "4"
cache: yarn
before_script:
- npm install
script: npm run --silent lint
- yarn global add gulp
- yarn install
script: gulp --harmony lint
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**
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<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://github.com/gnunn1/terminix">Terminix</a> color scheme.</p>
<p align="center">A arctic, north-bluish clean and elegant <a href="https://gnunn1.github.io/terminix-web">Terminix</a> color scheme.</p>

<p align="center">Designed for a fluent and clear workflow.<br>
Based on the <a href="https://github.com/arcticicestudio/nord">Nord</a> color palette.</p>
Expand All @@ -14,9 +14,9 @@ Based on the <a href="https://github.com/arcticicestudio/nord">Nord</a> color pa
## Getting started
### Installation
#### Manual
Copy the [`nord.json`](https://github.com/arcticicestudio/nord-terminix/tree/develop/src/json/nord-json) file to the color schemes directory according to the desired installation type.
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>
16 changes: 11 additions & 5 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@
# repository https://github.com/arcticicestudio/nord-terminix +
# author Arctic Ice Studio +
# email development@arcticicestudio.com +
# copyright Copyright (C) 2016 +
# copyright Copyright (C) 2017 +
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Circle CI
# (https://circleci.com/docs)
# (https://circleci.com/docs/language-nodejs)
# (https://circleci.com/docs/yarn)
machine:
node:
version: 6.1.0
version: 6
environment:
PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
dependencies:
override:
- npm install
- yarn global add gulp
- yarn install
cache_directories:
- ~/.cache/yarn
test:
override:
- npm run --silent lint
- gulp --harmony lint
43 changes: 43 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Project Gulp File +
project nord-terminix +
repository https://github.com/arcticicestudio/nord-terminix +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2017 +
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
[References]
Gulp
(http://gulpjs.com)
npmjs
(https://www.npmjs.com)
*/
/*+---------+
+ Imports +
+---------+*/
const gulp = require("gulp-help")(require("gulp"));
const eslint = require("gulp-eslint");

/*+-------+
+ Tasks +
+-------+*/
/**
* Shows the help.
*
* @since 0.2.0
*/
gulp.task("default", ["help"]);

/**
* Lints the color theme JSON file.
*
* @since 0.2.0
*/
gulp.task("lint", "Lints the color theme JSON file", () => {
return gulp.src("./src/json/nord.json")
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
});
12 changes: 6 additions & 6 deletions 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 Expand Up @@ -29,10 +29,10 @@
"scheme"
],
"devDependencies": {
"eslint": "3.10.2",
"eslint-plugin-json": "1.2.0"
},
"scripts": {
"lint": "eslint src/json/nord.json"
"eslint": "3.15.0",
"eslint-plugin-json": "1.2.0",
"gulp": "3.9.1",
"gulp-help": "1.6.1",
"gulp-eslint": "3.0.1"
}
}
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.
14 changes: 12 additions & 2 deletions src/json/nord.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"name": "Nord",
"comment": "A arctic, north-bluish clean and elegant Terminix color scheme.",
"use-theme-colors": false,
"foreground-color": "#D8DEE9",
"background-color": "#2E3440",
"badge-color": "#88C0D0",
"cursor-background-color": "#D8DEE9",
"cursor-foreground-color": "#D8DEE9",
"highlight-background-color": "#3B4252",
"highlight-foreground-color": "#D8DEE9",
"dim-color": "#3B4252",
"palette": [
"#3B4252",
"#BF616A",
Expand All @@ -21,5 +26,10 @@
"#B48EAD",
"#8FBCBB",
"#ECEFF4"
]
],
"use-theme-colors": false,
"use-badge-color": false,
"use-cursor-color": false,
"use-dim-color": false,
"use-highlight-color": false
}
Loading

0 comments on commit faa8fe4

Please sign in to comment.