Skip to content

Commit 58c34cb

Browse files
author
Marc J. Schmidt
committed
Merge pull request marcj#12 from gordonsyme/master
Add MIT license as suggested in marcj#10
2 parents 2401a15 + 26956a1 commit 58c34cb

File tree

4 files changed

+57
-1
lines changed

4 files changed

+57
-1
lines changed

LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2013 Marc J. Scmidt
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,30 @@ Event-Based resize detection inspired by [backalleycoder.com](http://www.backall
7171
7272
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/marcj/css-element-queries/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
7373
74+
75+
License
76+
-------
77+
This code is copyright 2013 Marc J. Schmidt and is licensed under the MIT license. See the `LICENSE` file for the full text.
78+
79+
80+
ElementQueries.convertToPx covered by the following license:
81+
82+
> Copyright (c) 2013 Rob Brackett
83+
>
84+
> Permission is hereby granted, free of charge, to any person obtaining a copy of
85+
> this software and associated documentation files (the "Software"), to deal in
86+
> the Software without restriction, including without limitation the rights to
87+
> use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
88+
> of the Software, and to permit persons to whom the Software is furnished to do
89+
> so, subject to the following conditions:
90+
>
91+
> The above copyright notice and this permission notice shall be included in all
92+
> copies or substantial portions of the Software.
93+
>
94+
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
95+
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
96+
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
97+
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
98+
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
99+
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
100+
> SOFTWARE.

src/ElementQueries.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright 2013 Marc J. Schmidt. See the LICENSE file at the top-level
3+
* directory of this distribution and at
4+
* https://github.com/marcj/css-element-queries/blob/master/LICENSE.
5+
*/
16
;
27
(function() {
38
/**
@@ -21,7 +26,7 @@
2126

2227
/**
2328
*
24-
* @copyright https://github.com/Mr0grog/element-query
29+
* @copyright https://github.com/Mr0grog/element-query/blob/master/LICENSE
2530
*
2631
* @param element
2732
* @param value

src/ResizeSensor.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Copyright 2013 Marc J. Schmidt. See the LICENSE file at the top-level
3+
* directory of this distribution and at
4+
* https://github.com/marcj/css-element-queries/blob/master/LICENSE.
5+
*/
16
;
27
(function() {
38

0 commit comments

Comments
 (0)