1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-03 08:59:12 +02:00

Merge branch 'gh-pages' into patch-1

This commit is contained in:
Mike Linksvayer 2021-08-13 12:16:46 -07:00 committed by GitHub
commit 7fbc9f2b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 30 deletions

View File

@ -16,9 +16,9 @@
</div> <!-- /container --> </div> <!-- /container -->
{% if page.collection == "licenses" or page.class == "license-types" %} {% if page.collection == "licenses" or page.class == "license-types" %}
<script src="/assets/vendor/jquery/jquery.min.js"></script> <script src="{{ 'assets/vendor/jquery/jquery.min.js' | relative_url }}"></script>
<script src="/assets/vendor/qtip2/jquery.qtip.min.js"></script> <script src="{{ 'assets/vendor/qtip2/jquery.qtip.min.js' | relative_url }}"></script>
<script src="/assets/vendor/clipboard/dist/clipboard.min.js"></script> <script src="{{ 'assets/vendor/clipboard/dist/clipboard.min.js' | relative_url }}"></script>
<script> <script>
window.annotations = {{ site.data.rules | jsonify }}; window.annotations = {{ site.data.rules | jsonify }};
{% if page.collection == "licenses" %} {% if page.collection == "licenses" %}
@ -32,7 +32,7 @@
]; ];
{% endif %} {% endif %}
</script> </script>
<script src="/assets/js/app.js"></script> <script src="{{ 'assets/js/app.js' | relative_url }}"></script>
{% endif %} {% endif %}
</body> </body>
</html> </html>

View File

@ -5,8 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Chivo:900"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Chivo:900">
<link rel="stylesheet" href="/assets/css/application.css?v={{ site.github.build_revision }}"> <link rel="stylesheet" href="{{ 'assets/css/application.css' | relative_url }}?v={{ site.github.build_revision }}">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="{{ 'favicon.ico' | relative_url }}" type="image/x-icon">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="/assets/vendor/html5shiv/dist/html5shiv.js"></script> <script src="/assets/vendor/html5shiv/dist/html5shiv.js"></script>
<script src="/assets/vendor/selectivizr/selectivizr.js"></script> <script src="/assets/vendor/selectivizr/selectivizr.js"></script>

View File

@ -25,6 +25,8 @@ limitations:
--- ---
BSD Zero Clause License
Copyright (c) [year] [fullname] Copyright (c) [year] [fullname]
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any

View File

@ -43,13 +43,13 @@ the following:
collective work; collective work;
b) to translate, adapt, alter, transform, modify, or arrange the Original b) to translate, adapt, alter, transform, modify, or arrange the Original
Work, thereby creating derivative works ("Derivative Works") based upon Work, thereby creating derivative works ("Derivative Works") based upon the
the Original Work; Original Work;
c) to distribute or communicate copies of the Original Work and c) to distribute or communicate copies of the Original Work and Derivative
Derivative Works to the public, under any license of your choice that Works to the public, under any license of your choice that does not
does not contradict the terms and conditions, including Licensor's contradict the terms and conditions, including Licensor's reserved rights
reserved rights and remedies, in this Academic Free License; and remedies, in this Academic Free License;
d) to perform the Original Work publicly; and d) to perform the Original Work publicly; and

View File

@ -8,7 +8,7 @@ description: A permissive license similar to the <a href="/licenses/bsd-2-clause
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.
using: using:
d3: https://github.com/d3/d3/blob/master/LICENSE Flutter: https://github.com/flutter/flutter/blob/master/LICENSE
LevelDB: https://github.com/google/leveldb/blob/master/LICENSE LevelDB: https://github.com/google/leveldb/blob/master/LICENSE
Quill: https://github.com/quilljs/quill/blob/develop/LICENSE Quill: https://github.com/quilljs/quill/blob/develop/LICENSE

View File

@ -28,16 +28,16 @@ limitations:
ISC License ISC License
Copyright (c) [year], [fullname] Copyright (c) [year] [fullname]
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies. copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. PERFORMANCE OF THIS SOFTWARE.

View File

@ -41,7 +41,7 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the
following licensing notice adjacent to the copyright notice for the Original following licensing notice adjacent to the copyright notice for the Original
Work: Work:
Licensed under the Open Software License version 3.0 Licensed under the Open Software License version 3.0
1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
non-exclusive, sublicensable license, for the duration of the copyright, to do non-exclusive, sublicensable license, for the duration of the copyright, to do

View File

@ -1,8 +1,8 @@
--- ---
--- ---
@import "/assets/vendor/normalize-css/normalize.css"; @import "../vendor/normalize-css/normalize.css";
@import "/assets/vendor/qtip2/jquery.qtip.min.css"; @import "../vendor/qtip2/jquery.qtip.min.css";
body { body {
background: #fafafa; background: #fafafa;