Skip to content

Commit 5a861e9

Browse files
arcticicestudioarcticicestudio
committed
Update MIT licensing
Update the MIT license to adapt to the changes of the main "Nord" (1) project. Detailed information can be found in the main task ticket. References: (1) https://github.com/arcticicestudio/nord Subtask of nordtheme/nord#55 GH-57
1 parent 087b320 commit 5a861e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+421
-586
lines changed

‎.eslintrc.js

+13-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*
2-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title ESLint Configuration +
4-
project nord-atom-syntax +
5-
repository https://github.com/arcticicestudio/nord-atom-syntax +
6-
author Arctic Ice Studio +
7-
email [email protected] +
8-
copyright Copyright (C) 2017 +
9-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord Atom Syntax
6+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
7+
* License: MIT
8+
* References:
9+
* http://eslint.org/docs/rules
10+
* http://eslint.org/docs/user-guide/configuring
11+
* http://eslint.org/docs/user-guide/configuring#using-configuration-files
12+
* http://eslint.org/docs/user-guide/configuring#specifying-environments
13+
* http://eslint.org/docs/user-guide/configuring.html#specifying-globals
14+
*/
1015

11-
[References]
12-
ESLint
13-
http://eslint.org/docs/rules
14-
http://eslint.org/docs/user-guide/configuring
15-
http://eslint.org/docs/user-guide/configuring#using-configuration-files
16-
http://eslint.org/docs/user-guide/configuring#specifying-environments
17-
http://eslint.org/docs/user-guide/configuring.html#specifying-globals
18-
*/
1916
module.exports = {
2017
"env": {
2118
"node": true,

‎.stylelintrc.js

+11-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
/*
2-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title stylelint Configuration +
4-
project nord-atom-syntax +
5-
repository https://github.com/arcticicestudio/nord-atom-syntax +
6-
author Arctic Ice Studio +
7-
email [email protected] +
8-
copyright Copyright (C) 2017 +
9-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord Atom Syntax
6+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
7+
* License: MIT
8+
* References:
9+
* https://stylelint.io
10+
* https://stylelint.io/user-guide/rules
11+
* https://github.com/stylelint/stylelint-config-standard
12+
*/
1013

11-
[References]
12-
stylelint
13-
https://stylelint.io
14-
https://stylelint.io/user-guide/rules
15-
https://github.com/stylelint/stylelint-config-standard
16-
*/
1714
module.exports = {
1815
"extends": "stylelint-config-standard",
1916
"rules": {

‎.travis.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2-
# title Travis CI Build Configuration +
3-
# project nord-atom-syntax +
4-
# repository https://github.com/arcticicestudio/nord-atom-syntax +
5-
# author Arctic Ice Studio +
6-
# email [email protected] +
7-
# copyright Copyright (C) 2017 +
8-
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9-
#
10-
# [References]
11-
# Travis CI
1+
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
2+
# Copyright (c) 2016-present Sven Greb <[email protected]>
3+
4+
# Project: Nord Atom Syntax
5+
# Repository: https://github.com/arcticicestudio/nord-atom-syntax
6+
# License: MIT
7+
# References:
128
# https://docs.travis-ci.com
13-
# Atom CI
149
# https://github.com/atom/ci
10+
1511
language: generic
1612
dist: trusty
1713
sudo: false

‎LICENSE.md

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
Copyright (c) 2017 Arctic Ice Studio <[email protected]>
1+
MIT License (MIT)
22

3-
Permission is hereby granted, free of charge, to any person obtaining
4-
a copy of this software and associated documentation files (the
5-
"Software"), to deal in the Software without restriction, including
6-
without limitation the rights to use, copy, modify, merge, publish,
7-
distribute, sublicense, and/or sell copies of the Software, and to
8-
permit persons to whom the Software is furnished to do so, subject to
9-
the following conditions:
3+
Copyright (c) 2016-present Arctic Ice Studio <[email protected]> (http://arcticicestudio.com)
4+
Copyright (c) 2016-present Sven Greb <[email protected]> (http://svengreb.de)
105

11-
The above copyright notice and this permission notice shall be
12-
included in all copies or substantial portions of the Software.
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
1312

14-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ Please report issues/bugs, feature requests and suggestions for improvements to
5656

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

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

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

6363
[scrot-lang-c]: https://raw.githubusercontent.com/arcticicestudio/nord-atom-syntax/develop/assets/scrot-lang-c.png
6464
[scrot-lang-java]: https://raw.githubusercontent.com/arcticicestudio/nord-atom-syntax/develop/assets/scrot-lang-java.png

‎circle.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2-
# title Circle CI Build Configuration +
3-
# project nord-atom-syntax +
4-
# repository https://github.com/arcticicestudio/nord-atom-syntax +
5-
# author Arctic Ice Studio +
6-
# email [email protected] +
7-
# copyright Copyright (C) 2017 +
8-
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9-
#
10-
# [References]
11-
# Circle CI
1+
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
2+
# Copyright (c) 2016-present Sven Greb <[email protected]>
3+
4+
# Project: Nord Atom Syntax
5+
# Repository: https://github.com/arcticicestudio/nord-atom-syntax
6+
# License: MIT
7+
# References:
128
# https://circleci.com/docs
13-
# Atom CI
149
# https://github.com/atom/ci
10+
1511
machine:
1612
environment:
1713
ATOM_LINT_WITH_BUNDLED_NODE: "true"

‎gulpfile.js

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
"use strict";
21
/*
3-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4-
title Project Gulp File +
5-
project nord-atom-syntax +
6-
repository https://github.com/arcticicestudio/nord-atom-syntax +
7-
author Arctic Ice Studio +
8-
email [email protected] +
9-
copyright Copyright (C) 2017 +
10-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord Atom Syntax
6+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
7+
* License: MIT
8+
* References:
9+
* http://gulpjs.com
10+
* https://www.npmjs.com
11+
*/
1112

12-
[References]
13-
Gulp
14-
(http://gulpjs.com)
15-
npmjs
16-
(https://www.npmjs.com)
17-
*/
1813
/*+---------+
1914
+ Imports +
2015
+---------+*/

‎index.less

+12-19
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
/*
2-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title Index +
4-
project nord-atom-syntax +
5-
version 0.9.1 +
6-
repository https://github.com/arcticicestudio/nord-atom-syntax +
7-
author Arctic Ice Studio +
8-
email [email protected] +
9-
copyright Copyright (C) 2017 +
10-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord Atom Syntax
6+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
7+
* License: MIT
8+
* References:
9+
* https://atom.io/docs/api/latest/Atom
10+
* https://atom.io/docs
11+
* https://github.com/atom/atom/blob/master/static/variables/syntax-variables.less
12+
* http://lesscss.org
13+
*/
1114

12-
[References]
13-
Nord
14-
(https://github.com/arcticicestudio/nord)
15-
Atom
16-
(https://atom.io/docs/api/latest/Atom)
17-
(https://atom.io/docs)
18-
(https://github.com/atom/atom/blob/master/static/variables/syntax-variables.less)
19-
LESSCSS
20-
(http://lesscss.org)
21-
*/
2215
/*+---------+
2316
+ Imports +
2417
+---------+*/

‎lib/constants.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"use babel";
22
"use strict";
3+
34
/*
4-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
5-
title Library Constants +
6-
project nord-atom-syntax +
7-
repository https://github.com/arcticicestudio/nord-atom-syntax +
8-
author Arctic Ice Studio +
9-
email [email protected] +
10-
copyright Copyright (C) 2017 +
11-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
12-
*/
5+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
6+
* Copyright (c) 2016-present Sven Greb <[email protected]>
7+
*
8+
* Project: Nord Atom Syntax
9+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
10+
* License: MIT
11+
*/
12+
1313
module.exports = Object.freeze({
1414
DEFAULT_COMMENT_CONTRAST: 0,
1515
MINIMUM_COMMENT_CONTRAST: 0,

‎lib/main.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"use babel";
22
"use strict";
3+
34
/*
4-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
5-
title Main Theme Library +
6-
project nord-atom-syntax +
7-
repository https://github.com/arcticicestudio/nord-atom-syntax +
8-
author Arctic Ice Studio +
9-
email [email protected] +
10-
copyright Copyright (C) 2017 +
11-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
12-
*/
5+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
6+
* Copyright (c) 2016-present Sven Greb <[email protected]>
7+
*
8+
* Project: Nord Atom Syntax
9+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
10+
* License: MIT
11+
*/
12+
1313
import fs from "fs";
1414
import { toggleClass } from "./utils";
1515

‎lib/utils.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"use babel";
22
"use strict";
3+
34
/*
4-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
5-
title Util Theme Library +
6-
project nord-atom-syntax +
7-
repository https://github.com/arcticicestudio/nord-atom-syntax +
8-
author Arctic Ice Studio +
9-
email [email protected] +
10-
copyright Copyright (C) 2017 +
11-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
12-
*/
5+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
6+
* Copyright (c) 2016-present Sven Greb <[email protected]>
7+
*
8+
* Project: Nord Atom Syntax
9+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
10+
* License: MIT
11+
*/
12+
1313
export default {
1414
toggleClass(boolean, className) {
1515
let root = document.querySelector("atom-workspace");

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"minimal",
2323
"syntax"
2424
],
25-
"license": "MIT",
25+
"license": "(MIT AND CC-BY-SA-4.0)",
2626
"engines": {
2727
"atom": ">=1.13.0 <2.0.0"
2828
},

‎spec/theme-settings/accessibility/custom-comment-contrast-spec.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
/*
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord Atom Syntax
6+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
7+
* License: MIT
8+
*/
9+
110
"use babel";
211
"use strict";
3-
/*
4-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
5-
title Accessibility: Custom Comment Contrast +
6-
project nord-atom-syntax +
7-
repository https://github.com/arcticicestudio/nord-atom-syntax +
8-
author Arctic Ice Studio +
9-
email [email protected] +
10-
copyright Copyright (C) 2017 +
11-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
12-
*/
12+
1313
import { DEFAULT_COMMENT_CONTRAST, MINIMUM_COMMENT_CONTRAST, MAXIMUM_COMMENT_CONTRAST } from "../../../lib/constants";
1414

1515
describe("Nord Atom Syntax accessibility custom comment contrast theme settings", () => {

‎styles/editor.less

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/*
2-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title Editor +
4-
project nord-atom-syntax +
5-
repository https://github.com/arcticicestudio/nord-atom-syntax +
6-
author Arctic Ice Studio +
7-
email [email protected] +
8-
copyright Copyright (C) 2017 +
9-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10-
*/
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord Atom Syntax
6+
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
7+
* License: MIT
8+
*/
9+
1110
atom-text-editor {
1211
background-color: @syntax-background-color;
1312
color: @syntax-text-color;

0 commit comments

Comments
 (0)