mirror of
https://github.com/github/choosealicense.com
synced 2024-12-22 12:50:24 +01:00
Merge branch 'gh-pages' into patch-1
This commit is contained in:
commit
7fbc9f2b2d
@ -16,9 +16,9 @@
|
||||
</div> <!-- /container -->
|
||||
|
||||
{% if page.collection == "licenses" or page.class == "license-types" %}
|
||||
<script src="/assets/vendor/jquery/jquery.min.js"></script>
|
||||
<script src="/assets/vendor/qtip2/jquery.qtip.min.js"></script>
|
||||
<script src="/assets/vendor/clipboard/dist/clipboard.min.js"></script>
|
||||
<script src="{{ 'assets/vendor/jquery/jquery.min.js' | relative_url }}"></script>
|
||||
<script src="{{ 'assets/vendor/qtip2/jquery.qtip.min.js' | relative_url }}"></script>
|
||||
<script src="{{ 'assets/vendor/clipboard/dist/clipboard.min.js' | relative_url }}"></script>
|
||||
<script>
|
||||
window.annotations = {{ site.data.rules | jsonify }};
|
||||
{% if page.collection == "licenses" %}
|
||||
@ -32,7 +32,7 @@
|
||||
];
|
||||
{% endif %}
|
||||
</script>
|
||||
<script src="/assets/js/app.js"></script>
|
||||
<script src="{{ 'assets/js/app.js' | relative_url }}"></script>
|
||||
{% endif %}
|
||||
</body>
|
||||
</html>
|
||||
|
@ -5,8 +5,8 @@
|
||||
<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="/assets/css/application.css?v={{ site.github.build_revision }}">
|
||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
|
||||
<link rel="stylesheet" href="{{ 'assets/css/application.css' | relative_url }}?v={{ site.github.build_revision }}">
|
||||
<link rel="shortcut icon" href="{{ 'favicon.ico' | relative_url }}" type="image/x-icon">
|
||||
<!--[if lt IE 9]>
|
||||
<script src="/assets/vendor/html5shiv/dist/html5shiv.js"></script>
|
||||
<script src="/assets/vendor/selectivizr/selectivizr.js"></script>
|
||||
|
@ -25,6 +25,8 @@ limitations:
|
||||
|
||||
---
|
||||
|
||||
BSD Zero Clause License
|
||||
|
||||
Copyright (c) [year] [fullname]
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
|
@ -43,13 +43,13 @@ the following:
|
||||
collective work;
|
||||
|
||||
b) to translate, adapt, alter, transform, modify, or arrange the Original
|
||||
Work, thereby creating derivative works ("Derivative Works") based upon
|
||||
the Original Work;
|
||||
Work, thereby creating derivative works ("Derivative Works") based upon the
|
||||
Original Work;
|
||||
|
||||
c) to distribute or communicate copies of the Original Work and
|
||||
Derivative Works to the public, under any license of your choice that
|
||||
does not contradict the terms and conditions, including Licensor's
|
||||
reserved rights and remedies, in this Academic Free License;
|
||||
c) to distribute or communicate copies of the Original Work and Derivative
|
||||
Works to the public, under any license of your choice that does not
|
||||
contradict the terms and conditions, including Licensor's reserved rights
|
||||
and remedies, in this Academic Free License;
|
||||
|
||||
d) to perform the Original Work publicly; and
|
||||
|
||||
|
@ -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.
|
||||
|
||||
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
|
||||
Quill: https://github.com/quilljs/quill/blob/develop/LICENSE
|
||||
|
||||
|
@ -28,16 +28,16 @@ limitations:
|
||||
|
||||
ISC License
|
||||
|
||||
Copyright (c) [year], [fullname]
|
||||
Copyright (c) [year] [fullname]
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
PERFORMANCE OF THIS SOFTWARE.
|
||||
|
@ -1,8 +1,8 @@
|
||||
---
|
||||
---
|
||||
|
||||
@import "/assets/vendor/normalize-css/normalize.css";
|
||||
@import "/assets/vendor/qtip2/jquery.qtip.min.css";
|
||||
@import "../vendor/normalize-css/normalize.css";
|
||||
@import "../vendor/qtip2/jquery.qtip.min.css";
|
||||
|
||||
body {
|
||||
background: #fafafa;
|
||||
|
Loading…
x
Reference in New Issue
Block a user