Skip to content

Commit

Permalink
Merge pull request #8 from arcticicestudio/subtask/gh-7-migrate-to-mi…
Browse files Browse the repository at this point in the history
…t-license

Migrate to MIT license
  • Loading branch information
arcticicestudio authored Jan 8, 2018
2 parents 32c7379 + 09e02c8 commit 89c7578
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 405 deletions.
16 changes: 7 additions & 9 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title stylelint Configuration +
project nord-highlightjs +
repository https://github.com/arcticicestudio/nord-highlightjs +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2017-present Sven Greb <[email protected]>
*
* Project: Nord highlight.js
* Repository: https://github.com/arcticicestudio/nord-highlightjs
* License: MIT
*/

/**
* Configuration for stylelint.
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-highlightjs +
# repository https://github.com/arcticicestudio/nord-highlightjs +
# author Arctic Ice Studio +
# email [email protected] +
# copyright Copyright (C) 2017 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Travis CI Documentation
# Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
# Copyright (c) 2017-present Sven Greb <[email protected]>

# Project: Nord highlight.js
# Repository: https://github.com/arcticicestudio/nord-highlightjs
# License: MIT
# References:
# https://docs.travis-ci.com/user/languages/javascript-with-nodejs

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 @@ -77,9 +77,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">Copyright &copy; 2017 Arctic Ice Studio</p>
<p align="center">Copyright &copy; 2017-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-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>
<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>

[hljs-docs-usage]: https://highlightjs.org/usage
[nord-develop-zip]: https://github.com/arcticicestudio/nord-highlightjs/archive/develop.zip
Expand Down
16 changes: 7 additions & 9 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Project Gulp File +
project nord-highlightjs +
repository https://github.com/arcticicestudio/nord-highlightjs +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2017-present Sven Greb <[email protected]>
*
* Project: Nord highlight.js
* Repository: https://github.com/arcticicestudio/nord-highlightjs
* License: MIT
*/

const gulp = require("gulp-help")(require("gulp"));
import browserSync from "browser-sync";
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-highlightjs/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: 10 additions & 17 deletions src/nord.scss
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Nord highlight.js +
project nord-highlightjs +
version 0.1.0 +
repository https://github.com/arcticicestudio/nord-highlightjs +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
[References]
Nord
https://github.com/arcticicestudio/nord
highlight.js
http://highlightjs.readthedocs.io/en/latest/style-guide.html
http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
*/
* Copyright (c) 2017-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2017-present Sven Greb <[email protected]>
*
* Project: Nord highlight.js
* Repository: https://github.com/arcticicestudio/nord-highlightjs
* License: MIT
* References:
* http://highlightjs.readthedocs.io/en/latest/style-guide.html
* http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
*/

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

Expand Down

0 comments on commit 89c7578

Please sign in to comment.