Skip to content

Commit

Permalink
Merge pull request #70 from arcticicestudio/task/gh-55-migrate-to-mit…
Browse files Browse the repository at this point in the history
…-license

Migrate to MIT license
  • Loading branch information
arcticicestudio authored Jan 8, 2018
2 parents 200eda8 + 7614638 commit b91dd4a
Show file tree
Hide file tree
Showing 12 changed files with 124 additions and 497 deletions.
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 +
repository https://github.com/arcticicestudio/nord +
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
* Repository: https://github.com/arcticicestudio/nord
* 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 +
repository https://github.com/arcticicestudio/nord +
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
* Repository: https://github.com/arcticicestudio/nord
* 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
19 changes: 8 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# ++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Travis CI Build Configuration +
# project nord +
# repository https://github.com/arcticicestudio/nord +
# 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
# Repository: https://github.com/arcticicestudio/nord
# License: MIT
# References:
# https://docs.travis-ci.com

language: node_js
dist: trusty
sudo: false
Expand Down
378 changes: 22 additions & 356 deletions LICENSE.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,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="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-blue.svg"/></a></p>
<p align="center"><a href="https://github.com/arcticicestudio/nord/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>

[gulp]: http://gulpjs.com
[nord-stylus]: https://github.com/arcticicestudio/nord/blob/develop/src/stylus/nord.styl
Expand Down
19 changes: 8 additions & 11 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# ++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Circle CI Build Configuration +
# project nord +
# repository https://github.com/arcticicestudio/nord +
# 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
# Repository: https://github.com/arcticicestudio/nord
# License: MIT
# References:
# https://circleci.com/docs

machine:
environment:
PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
Expand Down
25 changes: 11 additions & 14 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
"use strict";

/*
++++++++++++++++++++++++++++++++++++++++++++++++++++
title Project Gulp File +
project nord +
repository https://github.com/arcticicestudio/nord +
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
* Repository: https://github.com/arcticicestudio/nord
* License: MIT
* References:
* http://gulpjs.com
* https://www.npmjs.com
*/

[References]
Gulp
http://gulpjs.com
npmjs
https://www.npmjs.com
*/
/*+---------------+
+ Configuration +
+---------------+*/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bugs": {
"url": "https://github.com/arcticicestudio/nord/issues"
},
"license" : "(Apache-2.0 AND CC-BY-SA-4.0)",
"license" : "(MIT AND CC-BY-SA-4.0)",
"keywords": [
"nord",
"arctic",
Expand Down
27 changes: 11 additions & 16 deletions src/lesscss/nord.less
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++
title Nord +
project nord +
version 0.2.0 +
repository https://github.com/arcticicestudio/nord +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++
[References]
KSS
(http://warpspire.com/kss)
kss-node
(https://github.com/kss-node/kss-node)
*/
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* Project: Nord
* Version: 0.2.0
* Repository: https://github.com/arcticicestudio/nord
* License: MIT
* References:
* http://warpspire.com/kss
* https://github.com/kss-node/kss-node
*/

// An arctic, north-bluish color palette.
// Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax
Expand Down
26 changes: 10 additions & 16 deletions src/sass/nord.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
//
// ++++++++++++++++++++++++++++++++++++++++++++++++++++
// title Nord +
// project nord +
// version 0.2.0 +
// repository https://github.com/arcticicestudio/nord +
// author Arctic Ice Studio +
// email [email protected] +
// copyright Copyright (C) 2017 +
// ++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// [References]
// Sass
// (http://sass-lang.com)
// SassDoc
// (http://sassdoc.com)
// Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
// Copyright (c) 2016-present Sven Greb <[email protected]>

// Project: Nord
// Version: 0.2.0
// Repository: https://github.com/arcticicestudio/nord
// License: MIT
// References:
// http://sass-lang.com
// http://sassdoc.com

////
/// An arctic, north-bluish color palette.
Expand Down
38 changes: 15 additions & 23 deletions src/sass/template-css.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++
title Nord +
project nord +
version 0.2.0 +
repository https://github.com/arcticicestudio/nord +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++
[References]
W3C
(https://www.w3.org/TR/css-variables)
(https://www.w3.org/TR/selectors/#root-pseudo)
CSS Working Group
(https://drafts.csswg.org/css-variables)
MDN
(https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_variables)
KSS
(http://warpspire.com/kss)
kss-node
(https://github.com/kss-node/kss-node)
*/
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* Project: Nord
* Version: 0.2.0
* Repository: https://github.com/arcticicestudio/nord
* License: MIT
* References:
* https://www.w3.org/TR/css-variables
* https://www.w3.org/TR/selectors/#root-pseudo
* https://drafts.csswg.org/css-variables
* https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_variables
* http://warpspire.com/kss
* https://github.com/kss-node/kss-node
*/

@import "nord";

Expand Down
29 changes: 12 additions & 17 deletions src/stylus/nord.styl
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++
title Nord +
project nord +
version 0.3.0 +
repository https://github.com/arcticicestudio/nord +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++
[References]
Stylus
http://stylus-lang.com
KSS
http://warpspire.com/kss
https://github.com/kss-node/kss-node
*/
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
*
* Project: Nord
* Version: 0.2.0
* Repository: https://github.com/arcticicestudio/nord
* License: MIT
* References:
* http://stylus-lang.com
* http://warpspire.com/kss
* https://github.com/kss-node/kss-node
*/

// An arctic, north-bluish color palette.
// Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax
Expand Down

0 comments on commit b91dd4a

Please sign in to comment.