Skip to content

Commit 6516547

Browse files
arcticicestudioarcticicestudio
committed
Merge branch 'release/0.3.0'
2 parents faa8fe4 + 85e3ecd commit 6516547

12 files changed

+3422
-3094
lines changed

‎.eslintrc.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title ESLint Configuration +
4-
project nord-terminix +
5-
repository https://github.com/arcticicestudio/nord-terminix +
6-
author Arctic Ice Studio +
7-
email [email protected] +
8-
copyright Copyright (C) 2017 +
9-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3+
title ESLint Configuration +
4+
project nord-tilix +
5+
repository https://github.com/arcticicestudio/nord-tilix +
6+
author Arctic Ice Studio +
7+
email [email protected] +
8+
copyright Copyright (C) 2017 +
9+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1010
1111
[References]
1212
ESLint

‎.travis.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2-
# title Travis CI Build Configuration +
3-
# project nord-terminix +
4-
# repository https://github.com/arcticicestudio/nord-terminix +
5-
# author Arctic Ice Studio +
6-
# email [email protected] +
7-
# copyright Copyright (C) 2017 +
8-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1+
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
# title Travis CI Build Configuration +
3+
# project nord-tilix +
4+
# repository https://github.com/arcticicestudio/nord-tilix +
5+
# author Arctic Ice Studio +
6+
# email [email protected] +
7+
# copyright Copyright (C) 2017 +
8+
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
99
#
1010
# [References]
1111
# Travis CI Documentation

‎CHANGELOG.md

+20-10
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,43 @@
1-
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-terminix/develop/src/assets/nord-terminix-banner.svg"/></p>
1+
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-tilix/develop/src/assets/nord-tilix-banner.svg"/></p>
22

3-
<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>
3+
<p align="center"><img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-tilix/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-tilix.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/tilix-web"><img src="https://img.shields.io/badge/Tilix-v1.5.0+-4C566A.svg"/></a></p>
44

55
---
66

7+
# 0.3.0
8+
*2017-03-26*
9+
This project has been renamed to *Nord Tilix*.
10+
The upstream project [Terminix has been renamed to *Tilix* due to trademark infringement](https://github.com/gnunn1/tilix/issues/815).
11+
All text occurrences- and project assets have been updated to match the new name. (@arcticicestudio, #15, d32c9906)
12+
13+
## Bug Fixes
14+
### Documentation
15+
❯ Fixed a typo in the project description. (@arcticicestudio, #12, fd02252f)
16+
717
# 0.2.0
818
*2017-02-21*
919
## Features
10-
❯ 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)
20+
❯ Implemented support for advanced color settings including [badges](https://gnunn1.github.io/tilix-web/manual/badges). Disabled by default to allow users to enable them when they fit their needs. (@arcticicestudio, #9, cdf1c580)
1121

12-
<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>
22+
<p align="center"><strong>Advanced Color Settings</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-feature-advanced-settings.png"/><br><strong>Badges</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-feature-advanced-settings-badges.png"/></p>
1323

1424
## Improvements
1525
### Toolbox
16-
❯ 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)
26+
❯ Implemented a [`gulpfile.js`](https://github.com/arcticicestudio/nord-tilix/blob/develop/gulpfile.js) to run ESLint with defined [`.eslintrc.js`](https://github.com/arcticicestudio/nord-tilix/blob/develop/.eslintrc.js) rules. (@arcticicestudio, #10, 1b92f2f2)
1727

1828
### Continuous Integration Builds
19-
❯ [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)
20-
❯ [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)
21-
❯ 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)
29+
❯ [Circle CI](https://circleci.com/gh/arcticicestudio/nord-tilix) builds are now running against the latest [Node](https://nodejs.org) `6.x.x` version (@arcticicestudio, #10, 1b92f2f2)
30+
❯ [Travis-CI](https://travis-ci.org/arcticicestudio/nord-tilix) builds are now running against the latest [Node](https://nodejs.org) `6.x.x` and `4.x.x` versions (@arcticicestudio, #10, 1b92f2f2)
31+
❯ Added support for [EditorConfig](http://editorconfig.org) by defining rules via a [`.editorconfig`](https://github.com/arcticicestudio/nord-tilix/blob/develop/.editorconfig) file. (@arcticicestudio, #11, 748ac20c)
2232

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

30-
<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>
40+
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-colortest.png"/><br><strong>htop</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-htop.png"/></p>
3141

3242
# 0.0.0
3343
*2016-11-19*

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-terminix/develop/src/assets/nord-terminix-banner.svg"/></p>
1+
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-tilix/develop/src/assets/nord-tilix-banner.svg"/></p>
22

3-
<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>
3+
<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-tilix"><img src="https://img.shields.io/travis/arcticicestudio/nord-tilix/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-tilix"><img src="https://circleci.com/gh/arcticicestudio/nord-tilix.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-tilix/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-tilix.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/tilix-web"><img src="https://img.shields.io/badge/Tilix-v1.5.0+-4C566A.svg"/></a></p>
44

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

77
<p align="center">Designed for a fluent and clear workflow.<br>
88
Based on the <a href="https://github.com/arcticicestudio/nord">Nord</a> color palette.</p>
99

1010
---
1111

12-
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-colortest.png"/><blockquote>Font: <a href="https://adobe-fonts.github.io/source-code-pro">Source Code Pro</a> 12px.</blockquote></p>
12+
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-colortest.png"/><blockquote>Font: <a href="https://adobe-fonts.github.io/source-code-pro">Source Code Pro</a> 12px.</blockquote></p>
1313

1414
## Getting started
1515
### Installation
1616
#### Manual
17-
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.
17+
Copy the [`nord.json`](https://github.com/arcticicestudio/nord-tilix/blob/develop/src/json/nord.json) file to the color schemes directory according to the desired installation type.
1818

19-
Local: `~/.config/terminix/schemes`
20-
Global: `/usr/share/terminix/schemes`
19+
Local: `~/.config/tilix/schemes`
20+
Global: `/usr/share/tilix/schemes`
2121

2222
#### Install Script
2323
The included `install.sh` shell script can be used for an automated installation.
@@ -44,17 +44,17 @@ Syntax: `install.sh [OPTIONS]`
4444
3. Select `Nord` from the *Color scheme* drop-down menu
4545

4646
## Screenshots
47-
<p align="center"><strong>htop</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-terminix/develop/src/assets/scrot-htop.png"/></p>
47+
<p align="center"><strong>htop</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-htop.png"/></p>
4848

49-
<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>
49+
<p align="center"><strong>Advanced Color Settings</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-feature-advanced-settings.png"/><br><strong>Badges</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tilix/develop/src/assets/scrot-feature-advanced-settings-badges.png"/></p>
5050

5151
## Development
52-
[![](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)
52+
[![](https://img.shields.io/badge/Changelog-0.3.0-81A1C1.svg)](https://github.com/arcticicestudio/nord-tilix/blob/v0.3.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)
5353

54-
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).
54+
Continuous integration builds are running at [Travis-CI](https://travis-ci.org/arcticicestudio/nord-tilix) and [Circle CI](https://circleci.com/bb/arcticicestudio/nord-tilix).
5555

5656
### Contribution
57-
Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-terminix/issues).
57+
Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-tilix/issues).
5858

5959
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-footer-mountains.svg" /></p>
6060

‎circle.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2-
# title Circle CI Build Configuration +
3-
# project nord-terminix +
4-
# repository https://github.com/arcticicestudio/nord-terminix +
5-
# author Arctic Ice Studio +
6-
# email [email protected] +
7-
# copyright Copyright (C) 2017 +
8-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1+
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
# title Circle CI Build Configuration +
3+
# project nord-tilix +
4+
# repository https://github.com/arcticicestudio/nord-tilix +
5+
# author Arctic Ice Studio +
6+
# email [email protected] +
7+
# copyright Copyright (C) 2017 +
8+
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
99
#
1010
# [References]
1111
# Circle CI

‎gulpfile.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title Project Gulp File +
4-
project nord-terminix +
5-
repository https://github.com/arcticicestudio/nord-terminix +
6-
author Arctic Ice Studio +
7-
email [email protected] +
8-
copyright Copyright (C) 2017 +
9-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3+
title Project Gulp File +
4+
project nord-tilix +
5+
repository https://github.com/arcticicestudio/nord-tilix +
6+
author Arctic Ice Studio +
7+
email [email protected] +
8+
copyright Copyright (C) 2017 +
9+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1010
1111
[References]
1212
Gulp

‎install.sh

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env bash
2-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
# title Install Script +
4-
# project nord-terminix +
5-
# repository https://github.com/arcticicestudio/nord-terminix +
6-
# author Arctic Ice Studio +
7-
# email [email protected] +
8-
# copyright Copyright (C) 2016 +
9-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3+
# title Install Script +
4+
# project nord-tilix +
5+
# repository https://github.com/arcticicestudio/nord-tilix +
6+
# author Arctic Ice Studio +
7+
# email [email protected] +
8+
# copyright Copyright (C) 2017 +
9+
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1010
set -e
1111

1212
_ct_error="\e[0;31m"
@@ -38,7 +38,7 @@ __cleanup() {
3838
trap '' SIGINT SIGTERM
3939
unset -v _ct_error _ct_success _ct_warning _ct_highlight _ct_primary _ct
4040
unset -v _ctb_error _ctb_success _ctb_warning _ctb_highlight _ctb_primary _ctb _c_reset
41-
unset -v NORD_TERMINIX_SCRIPT_OPTS COLOR_SCHEME_FILE VERBOSE GLOBAL_INSTALL LOCAL_INSTALL
41+
unset -v NORD_TILIX_SCRIPT_OPTS COLOR_SCHEME_FILE VERBOSE GLOBAL_INSTALL LOCAL_INSTALL
4242
unset -f __help __cleanup __log_error __log_success __log_warning __log_info
4343
unset -f __validate_file __local_install __global_install
4444
}
@@ -127,14 +127,14 @@ __validate_file() {
127127

128128
trap "printf '${_ctb_error}User aborted.${_ctb_reset}\n' && exit 1" SIGINT SIGTERM
129129

130-
NORD_TERMINIX_SCRIPT_OPTS=`getopt -o vghs: --long verbose,global,help,schemefile: -n 'install.sh' -- "$@"`
130+
NORD_TILIX_SCRIPT_OPTS=`getopt -o vghs: --long verbose,global,help,schemefile: -n 'install.sh' -- "$@"`
131131
COLOR_SCHEME_FILE=src/json/nord.json
132132
VERBOSE=false
133133
GLOBAL_INSTALL=false
134-
LOCAL_INSTALL_DIR=~/.config/terminix/schemes
135-
GLOBAL_INSTALL_DIR=/usr/share/terminix/schemes
134+
LOCAL_INSTALL_DIR=~/.config/tilix/schemes
135+
GLOBAL_INSTALL_DIR=/usr/share/tilix/schemes
136136

137-
eval set -- "$NORD_TERMINIX_SCRIPT_OPTS"
137+
eval set -- "$NORD_TILIX_SCRIPT_OPTS"
138138
while true; do
139139
case "$1" in
140140
-v | --verbose ) VERBOSE=true; shift ;;

‎package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
2-
"name": "nord-terminix",
3-
"title": "Nord Terminix",
4-
"version": "0.2.0",
5-
"description": "A arctic, north-bluish clean and elegant Terminix color scheme.",
2+
"name": "nord-tilix",
3+
"title": "Nord Tilix",
4+
"version": "0.3.0",
5+
"description": "An arctic, north-bluish clean and elegant Tilix color scheme.",
66
"author": {
77
"name": "Arctic Ice Studio",
88
"email": "[email protected]",
99
"url": "http://arcticicestudio.com"
1010
},
11-
"homepage": "https://github.com/arcticicestudio/nord-terminix",
11+
"homepage": "https://github.com/arcticicestudio/nord-tilix",
1212
"repository": {
1313
"type": "git",
14-
"url": "git+https://github.com/arcticicestudio/nord-terminix.git"
14+
"url": "git+https://github.com/arcticicestudio/nord-tilix.git"
1515
},
1616
"bugs": {
17-
"url": "https://github.com/arcticicestudio/nord-terminix/issues"
17+
"url": "https://github.com/arcticicestudio/nord-tilix/issues"
1818
},
1919
"license" : "(Apache-2.0 AND CC-BY-SA-4.0)",
2020
"keywords": [
@@ -24,7 +24,7 @@
2424
"bluish",
2525
"clean",
2626
"elegant",
27-
"terminix",
27+
"tilix",
2828
"color",
2929
"scheme"
3030
],

0 commit comments

Comments
 (0)