Skip to content

Commit

Permalink
Merge pull request #71 from arcticicestudio/subtask/gh-70-update-mit-…
Browse files Browse the repository at this point in the history
…licensing

Update MIT licensing
  • Loading branch information
arcticicestudio committed Jan 8, 2018
2 parents a3bbbe4 + 0239ba2 commit 55587b2
Show file tree
Hide file tree
Showing 44 changed files with 436 additions and 521 deletions.
21 changes: 9 additions & 12 deletions .travis.yml
@@ -1,15 +1,12 @@
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Travis CI Build Configuration +
# project nord-atom-ui +
# repository https://github.com/arcticicestudio/nord-atom-ui +
# author Arctic Ice Studio +
# email development@arcticicestudio.com +
# copyright Copyright (C) 2016 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Travis CI Documentation
# (https://docs.travis-ci.com)
# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
# Copyright (c) 2016-present Sven Greb <code@svengreb.de>

# Project: Nord Atom UI
# Repository: https://github.com/arcticicestudio/nord-atom-ui
# License: MIT
# References:
# https://docs.travis-ci.com

language: objective-c
notifications:
email:
Expand Down
36 changes: 19 additions & 17 deletions LICENSE.md
@@ -1,20 +1,22 @@
Copyright (c) 2016 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.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -42,8 +42,8 @@ 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; 2016 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-ui/blob/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-ui/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-top]: https://raw.githubusercontent.com/arcticicestudio/nord-atom-ui/develop/assets/scrot-top.png
21 changes: 9 additions & 12 deletions circle.yml
@@ -1,15 +1,12 @@
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Circle CI Build Configuration +
# project nord-atom-ui +
# repository https://github.com/arcticicestudio/nord-atom-ui +
# author Arctic Ice Studio +
# email development@arcticicestudio.com +
# copyright Copyright (C) 2016 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Circle CI
# (https://circleci.com/docs)
# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
# Copyright (c) 2016-present Sven Greb <code@svengreb.de>

# Project: Nord Atom UI
# Repository: https://github.com/arcticicestudio/nord-atom-ui
# License: MIT
# References:
# https://circleci.com/docs

machine:
environment:
ATOM_LINT_WITH_BUNDLED_NODE: "true"
Expand Down
39 changes: 12 additions & 27 deletions index.less
@@ -1,32 +1,17 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Theme Index +
project nord-atom-ui +
version 0.11.0 +
repository https://github.com/arcticicestudio/nord-atom-ui +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (c) 2016-present Sven Greb <code@svengreb.de>
*
* Project: Nord Atom UI
* Repository: https://github.com/arcticicestudio/nord-atom-ui
* License: MIT
* References:
* https://atom.io/docs/api/latest/Atom
* https://atom.io/docs
* https://github.com/atom/atom/blob/master/static/variables/ui-variables.less
* http://lesscss.org
*/

[Index]
> Core
> Components
> Package Support
Community
Core
> Theme Settings
[References]
Nord
(https://github.com/arcticicestudio/nord)
Atom Documentation
(https://atom.io/docs/api/latest/Atom)
(https://atom.io/docs)
(https://github.com/atom/atom/blob/master/static/variables/ui-variables.less)
LESSCSS
(http://lesscss.org)
*/
/*+------+
+ Core +
+------+*/
Expand Down
7 changes: 7 additions & 0 deletions lib/main.coffee
@@ -1,3 +1,10 @@
# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
# Copyright (c) 2016-present Sven Greb <code@svengreb.de>

# Project: Nord Atom UI
# Repository: https://github.com/arcticicestudio/nord-atom-ui
# License: MIT

root = document.documentElement;

module.exports =
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -22,7 +22,7 @@
"minimal",
"ui"
],
"license": "MIT",
"license": "(MIT AND CC-BY-SA-4.0)",
"engines": {
"atom": ">=1.13.0 <2.0.0"
},
Expand Down
7 changes: 7 additions & 0 deletions spec/darker-form-focusing-effect-spec.coffee
@@ -1,3 +1,10 @@
# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
# Copyright (c) 2016-present Sven Greb <code@svengreb.de>

# Project: Nord Atom UI
# Repository: https://github.com/arcticicestudio/nord-atom-ui
# License: MIT

describe "Nord Atom UI theme", ->
beforeEach ->
waitsForPromise ->
Expand Down
7 changes: 7 additions & 0 deletions spec/full-width-tab-sizing-spec.coffee
@@ -1,3 +1,10 @@
# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
# Copyright (c) 2016-present Sven Greb <code@svengreb.de>

# Project: Nord Atom UI
# Repository: https://github.com/arcticicestudio/nord-atom-ui
# License: MIT

describe "Nord Atom UI theme", ->
beforeEach ->
waitsForPromise ->
Expand Down
46 changes: 20 additions & 26 deletions styles/atom.less
@@ -1,23 +1,17 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Atom Core Styles +
project nord-atom-ui +
repository https://github.com/arcticicestudio/nord-atom-ui +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
[Index]
> find-and-replace
> Keybinding Badges
> Scrollbars
> Select Forms
> Text Editors
*/
/*++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (c) 2016-present Sven Greb <code@svengreb.de>
*
* Atom core styles.
*
* Project: Nord Atom UI
* Repository: https://github.com/arcticicestudio/nord-atom-ui
* License: MIT
*/

/*+------------------+
+ find-and-replace +
++++++++++++++++++++*/
+------------------+*/
.project-find,
.find-and-replace {
atom-text-editor[mini].is-focused {
Expand Down Expand Up @@ -45,9 +39,9 @@ copyright Copyright (C) 2016 +
}
}

/*++++++++++++++++++++
/*+-------------------+
+ Keybinding Badges +
++++++++++++++++++++*/
+-------------------+*/
kbd {
.text(normal);
color: @tooltip-key-text-color;
Expand All @@ -58,9 +52,9 @@ kbd {
margin-left: @component-padding/2;
}

/*++++++++++++++
/*+------------+
+ Scrollbars +
+++++++++++++*/
+------------+*/
.scrollbars-visible-always {
::-webkit-scrollbar {
width: 10px;
Expand Down Expand Up @@ -104,9 +98,9 @@ kbd {
}
}

/*++++++++++++++++
/*+--------------+
+ Select Forms +
++++++++++++++++*/
+--------------+*/
select.form-control {
.button(@button-border-color);
.text(normal);
Expand All @@ -121,9 +115,9 @@ select.form-control {
}
}

/*++++++++++++++++
/*+--------------+
+ Text Editors +
++++++++++++++++*/
+--------------+*/
atom-text-editor[mini] {
transition: all @transition-time ease;
background-color: @input-background-color;
Expand Down
17 changes: 8 additions & 9 deletions styles/buttons.less
@@ -1,13 +1,12 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Buttons +
project nord-atom-ui +
repository https://github.com/arcticicestudio/nord-atom-ui +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (c) 2016-present Sven Greb <code@svengreb.de>
*
* Project: Nord Atom UI
* Repository: https://github.com/arcticicestudio/nord-atom-ui
* License: MIT
*/

button,
button.icon,
.btn-default,
Expand Down
17 changes: 8 additions & 9 deletions styles/editor.less
@@ -1,13 +1,12 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Editor +
project nord-atom-ui +
repository https://github.com/arcticicestudio/nord-atom-ui +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (c) 2016-present Sven Greb <code@svengreb.de>
*
* Project: Nord Atom UI
* Repository: https://github.com/arcticicestudio/nord-atom-ui
* License: MIT
*/

atom-text-editor {
.scroll-view {
padding: 0;
Expand Down
17 changes: 8 additions & 9 deletions styles/inputs.less
@@ -1,13 +1,12 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Inputs +
project nord-atom-ui +
repository https://github.com/arcticicestudio/nord-atom-ui +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (c) 2016-present Sven Greb <code@svengreb.de>
*
* Project: Nord Atom UI
* Repository: https://github.com/arcticicestudio/nord-atom-ui
* License: MIT
*/

input[type="checkbox"] {
&:focus {
box-shadow: none !important;
Expand Down
17 changes: 8 additions & 9 deletions styles/lists.less
@@ -1,13 +1,12 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Lists +
project nord-atom-ui +
repository https://github.com/arcticicestudio/nord-atom-ui +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (c) 2016-present Sven Greb <code@svengreb.de>
*
* Project: Nord Atom UI
* Repository: https://github.com/arcticicestudio/nord-atom-ui
* License: MIT
*/

.list-group,
.list-tree {
li .character-match {
Expand Down
17 changes: 8 additions & 9 deletions styles/messages.less
@@ -1,13 +1,12 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Messages +
project nord-atom-ui +
repository https://github.com/arcticicestudio/nord-atom-ui +
author Arctic Ice Studio +
email development@arcticicestudio.com +
copyright Copyright (C) 2016 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
* Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
* Copyright (c) 2016-present Sven Greb <code@svengreb.de>
*
* Project: Nord Atom UI
* Repository: https://github.com/arcticicestudio/nord-atom-ui
* License: MIT
*/

.background-message .message,
.background-message li {
.text(subtle);
Expand Down

0 comments on commit 55587b2

Please sign in to comment.