Skip to content

Commit 89c7578

Browse files
arcticicestudioarcticicestudio
authored
Merge pull request #8 from arcticicestudio/subtask/gh-7-migrate-to-mit-license
Migrate to MIT license
2 parents 32c7379 + 09e02c8 commit 89c7578

File tree

7 files changed

+57
-405
lines changed

7 files changed

+57
-405
lines changed

‎.stylelintrc.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/*
2-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title stylelint Configuration +
4-
project nord-highlightjs +
5-
repository https://github.com/arcticicestudio/nord-highlightjs +
6-
author Arctic Ice Studio +
7-
email [email protected] +
8-
copyright Copyright (C) 2017 +
9-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10-
*/
2+
* Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2017-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord highlight.js
6+
* Repository: https://github.com/arcticicestudio/nord-highlightjs
7+
* License: MIT
8+
*/
119

1210
/**
1311
* Configuration for stylelint.

‎.travis.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2-
# title Travis CI Build Configuration +
3-
# project nord-highlightjs +
4-
# repository https://github.com/arcticicestudio/nord-highlightjs +
5-
# author Arctic Ice Studio +
6-
# email [email protected] +
7-
# copyright Copyright (C) 2017 +
8-
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9-
#
10-
# [References]
11-
# Travis CI Documentation
1+
# Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
2+
# Copyright (c) 2017-present Sven Greb <[email protected]>
3+
4+
# Project: Nord highlight.js
5+
# Repository: https://github.com/arcticicestudio/nord-highlightjs
6+
# License: MIT
7+
# References:
128
# https://docs.travis-ci.com/user/languages/javascript-with-nodejs
9+
1310
language: node_js
1411
dist: trusty
1512
sudo: false

‎LICENSE.md

Lines changed: 22 additions & 356 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ Please report issues/bugs, feature requests and suggestions for improvements to
7777

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

80-
<p align="center">Copyright &copy; 2017 Arctic Ice Studio</p>
80+
<p align="center">Copyright &copy; 2017-present Arctic Ice Studio</p>
8181

82-
<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?style=flat-square"/></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?style=flat-square"/></a></p>
82+
<p align="center"><a href="https://github.com/arcticicestudio/nord-highlightjs/blob/develop/LICENSE.md"><img src="https://img.shields.io/badge/License-MIT-5E81AC.svg?style=flat-square"/></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?style=flat-square"/></a></p>
8383

8484
[hljs-docs-usage]: https://highlightjs.org/usage
8585
[nord-develop-zip]: https://github.com/arcticicestudio/nord-highlightjs/archive/develop.zip

‎gulpfile.babel.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/*
2-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title Project Gulp File +
4-
project nord-highlightjs +
5-
repository https://github.com/arcticicestudio/nord-highlightjs +
6-
author Arctic Ice Studio +
7-
email [email protected] +
8-
copyright Copyright (C) 2017 +
9-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10-
*/
2+
* Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2017-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord highlight.js
6+
* Repository: https://github.com/arcticicestudio/nord-highlightjs
7+
* License: MIT
8+
*/
119

1210
const gulp = require("gulp-help")(require("gulp"));
1311
import browserSync from "browser-sync";

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"bugs": {
1717
"url": "https://github.com/arcticicestudio/nord-highlightjs/issues"
1818
},
19-
"license": "(Apache-2.0 AND CC-BY-SA-4.0)",
19+
"license": "(MIT AND CC-BY-SA-4.0)",
2020
"keywords": [
2121
"nord",
2222
"arctic",

‎src/nord.scss

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
/*
2-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title Nord highlight.js +
4-
project nord-highlightjs +
5-
version 0.1.0 +
6-
repository https://github.com/arcticicestudio/nord-highlightjs +
7-
author Arctic Ice Studio +
8-
email [email protected] +
9-
copyright Copyright (C) 2017 +
10-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
11-
12-
[References]
13-
Nord
14-
https://github.com/arcticicestudio/nord
15-
highlight.js
16-
http://highlightjs.readthedocs.io/en/latest/style-guide.html
17-
http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
18-
*/
2+
* Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2017-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord highlight.js
6+
* Repository: https://github.com/arcticicestudio/nord-highlightjs
7+
* License: MIT
8+
* References:
9+
* http://highlightjs.readthedocs.io/en/latest/style-guide.html
10+
* http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
11+
*/
1912

2013
@import "../node_modules/nord/src/sass/nord";
2114

0 commit comments

Comments
 (0)