Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MIT licensing #58

Merged
merged 1 commit into from
Jan 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
/*
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title ESLint Configuration +
project nord-atom-syntax +
repository https://github.com/arcticicestudio/nord-atom-syntax +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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,
Expand Down
25 changes: 11 additions & 14 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title stylelint Configuration +
project nord-atom-syntax +
repository https://github.com/arcticicestudio/nord-atom-syntax +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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": {
Expand Down
20 changes: 8 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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 [email protected] +
# copyright Copyright (C) 2017 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Travis CI
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
# Copyright (c) 2016-present Sven Greb <[email protected]>

# 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
Expand Down
36 changes: 19 additions & 17 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
Copyright (c) 2017 Arctic Ice Studio <[email protected]>
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 <[email protected]> (http://arcticicestudio.com)
Copyright (c) 2016-present Sven Greb <[email protected]> (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.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 8 additions & 12 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -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 [email protected] +
# copyright Copyright (C) 2017 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Circle CI
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
# Copyright (c) 2016-present Sven Greb <[email protected]>

# 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"
Expand Down
25 changes: 10 additions & 15 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -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 [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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 +
+---------+*/
Expand Down
31 changes: 12 additions & 19 deletions index.less
Original file line number Diff line number Diff line change
@@ -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 [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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 +
+---------+*/
Expand Down
18 changes: 9 additions & 9 deletions lib/constants.js
Original file line number Diff line number Diff line change
@@ -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 [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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,
Expand Down
18 changes: 9 additions & 9 deletions lib/main.js
Original file line number Diff line number Diff line change
@@ -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 [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* Project: Nord Atom Syntax
* Repository: https://github.com/arcticicestudio/nord-atom-syntax
* License: MIT
*/

import fs from "fs";
import { toggleClass } from "./utils";

Expand Down
18 changes: 9 additions & 9 deletions lib/utils.js
Original file line number Diff line number Diff line change
@@ -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 [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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");
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"minimal",
"syntax"
],
"license": "MIT",
"license": "(MIT AND CC-BY-SA-4.0)",
"engines": {
"atom": ">=1.13.0 <2.0.0"
},
Expand Down
20 changes: 10 additions & 10 deletions spec/theme-settings/accessibility/custom-comment-contrast-spec.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/*
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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 [email protected] +
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", () => {
Expand Down
17 changes: 8 additions & 9 deletions styles/editor.less
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Editor +
project nord-atom-syntax +
repository https://github.com/arcticicestudio/nord-atom-syntax +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* 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;
Expand Down
Loading