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
nordtheme · Jan 4, 2018 · 5a861e9 · 5a861e9
1 parent 087b320
commit 5a861e9
Show file tree

Hide file tree

Showing 43 changed files with 421 additions and 586 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,21 +1,18 @@
 /*
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title ESLint Configuration +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ * References:
+ * http://eslint.org/docs/rules
+ * 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.html#specifying-globals
+ */
 
-[References]
-ESLint
- http://eslint.org/docs/rules
- 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.html#specifying-globals
-*/
 module.exports = {
  "env": {
  "node": true,

diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -1,19 +1,16 @@
 /*
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title stylelint Configuration +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ * References:
+ * https://stylelint.io
+ * https://stylelint.io/user-guide/rules
+ * https://github.com/stylelint/stylelint-config-standard
+ */
 
-[References]
-stylelint
- https://stylelint.io
- https://stylelint.io/user-guide/rules
- https://github.com/stylelint/stylelint-config-standard
-*/
 module.exports = {
  "extends": "stylelint-config-standard",
  "rules": {

diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,13 @@
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# title Travis CI Build Configuration +
-# project nord-atom-syntax +
-# repository https://github.com/arcticicestudio/nord-atom-syntax +
-# author Arctic Ice Studio +
-# email development@arcticicestudio.com +
-# copyright Copyright (C) 2017 +
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# [References]
-# Travis CI
+# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+
+# Project: Nord Atom Syntax
+# Repository: https://github.com/arcticicestudio/nord-atom-syntax
+# License: MIT
+# References:
 # https://docs.travis-ci.com
-# Atom CI
 # https://github.com/atom/ci
+
 language: generic
 dist: trusty
 sudo: false

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,20 +1,22 @@
-Copyright (c) 2017 Arctic Ice Studio <development@arcticicestudio.com>
+MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com> (http://arcticicestudio.com) 
+Copyright (c) 2016-present Sven Greb <code@svengreb.de> (http://svengreb.de)
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -56,9 +56,9 @@ Please report issues/bugs, feature requests and suggestions for improvements to
 
 <p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-footer-mountains.svg" /></p>
 
-<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2017 Arctic Ice Studio</p>
+<p align="center">Copyright &copy; 2016-present Arctic Ice Studio</p>
 
-<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>
+<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>
 
 [scrot-lang-c]: https://raw.githubusercontent.com/arcticicestudio/nord-atom-syntax/develop/assets/scrot-lang-c.png
 [scrot-lang-java]: https://raw.githubusercontent.com/arcticicestudio/nord-atom-syntax/develop/assets/scrot-lang-java.png

diff --git a/circle.yml b/circle.yml
@@ -1,17 +1,13 @@
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# title Circle CI Build Configuration +
-# project nord-atom-syntax +
-# repository https://github.com/arcticicestudio/nord-atom-syntax +
-# author Arctic Ice Studio +
-# email development@arcticicestudio.com +
-# copyright Copyright (C) 2017 +
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#
-# [References]
-# Circle CI
+# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+
+# Project: Nord Atom Syntax
+# Repository: https://github.com/arcticicestudio/nord-atom-syntax
+# License: MIT
+# References:
 # https://circleci.com/docs
-# Atom CI
 # https://github.com/atom/ci
+
 machine:
  environment:
  ATOM_LINT_WITH_BUNDLED_NODE: "true"

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,20 +1,15 @@
-"use strict";
 /*
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title Project Gulp File +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ * References:
+ * http://gulpjs.com
+ * https://www.npmjs.com
+ */
 
-[References]
-Gulp
- (http://gulpjs.com)
-npmjs
- (https://www.npmjs.com)
-*/
 /*+---------+
  + Imports +
  +---------+*/

diff --git a/index.less b/index.less
@@ -1,24 +1,17 @@
 /*
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title Index +
-project nord-atom-syntax +
-version 0.9.1 +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ * References:
+ * https://atom.io/docs/api/latest/Atom
+ * https://atom.io/docs
+ * https://github.com/atom/atom/blob/master/static/variables/syntax-variables.less
+ * http://lesscss.org
+ */
 
-[References]
-Nord
- (https://github.com/arcticicestudio/nord)
-Atom
- (https://atom.io/docs/api/latest/Atom)
- (https://atom.io/docs)
- (https://github.com/atom/atom/blob/master/static/variables/syntax-variables.less)
-LESSCSS
- (http://lesscss.org)
-*/
 /*+---------+
  + Imports +
  +---------+*/

diff --git a/lib/constants.js b/lib/constants.js
@@ -1,15 +1,15 @@
 "use babel";
 "use strict";
+
 /*
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title Library Constants +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-*/
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ */
+
 module.exports = Object.freeze({
  DEFAULT_COMMENT_CONTRAST: 0,
  MINIMUM_COMMENT_CONTRAST: 0,

diff --git a/lib/main.js b/lib/main.js
@@ -1,15 +1,15 @@
 "use babel";
 "use strict";
+
 /*
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title Main Theme Library +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-*/
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ */
+
 import fs from "fs";
 import { toggleClass } from "./utils";
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -1,15 +1,15 @@
 "use babel";
 "use strict";
+
 /*
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title Util Theme Library +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-*/
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ */
+
 export default {
  toggleClass(boolean, className) {
  let root = document.querySelector("atom-workspace");

diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
  "minimal",
  "syntax"
  ],
- "license": "MIT",
+ "license": "(MIT AND CC-BY-SA-4.0)",
  "engines": {
  "atom": ">=1.13.0 <2.0.0"
  },

diff --git a/spec/theme-settings/accessibility/custom-comment-contrast-spec.js b/spec/theme-settings/accessibility/custom-comment-contrast-spec.js
@@ -1,15 +1,15 @@
+/*
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ */
+
 "use babel";
 "use strict";
-/*
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title Accessibility: Custom Comment Contrast +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-*/
+
 import { DEFAULT_COMMENT_CONTRAST, MINIMUM_COMMENT_CONTRAST, MAXIMUM_COMMENT_CONTRAST } from "../../../lib/constants";
 
 describe("Nord Atom Syntax accessibility custom comment contrast theme settings", () => {

diff --git a/styles/editor.less b/styles/editor.less
@@ -1,13 +1,12 @@
 /*
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-title Editor +
-project nord-atom-syntax +
-repository https://github.com/arcticicestudio/nord-atom-syntax +
-author Arctic Ice Studio +
-email development@arcticicestudio.com +
-copyright Copyright (C) 2017 +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-*/
+ * Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+ * Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+ *
+ * Project: Nord Atom Syntax
+ * Repository: https://github.com/arcticicestudio/nord-atom-syntax
+ * License: MIT
+ */
+
 atom-text-editor {
  background-color: @syntax-background-color;
  color: @syntax-text-color;