docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00
Code Issues Releases Wiki Activity

Merge pull request #385 from github/LeoFNaN-patch-1

Browse Source 
add nickname and desc to sidebar, cleanup
This commit is contained in:
Mike Linksvayer 2016-04-04 22:47:10 -07:00
commit 01b29bfd60
10 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
_includes/sidebar.html
View File

@ -1,8 +1,25 @@
<div class="sidebar">
<a href="#" data-clipboard-target="#license-text" data-proofer-ignore="true" class="js-clipboard-button button">Copy license text to clipboard</a>
<div class="license-description">
<h3>Description</h3>
<p>
{{ page.description }}
</p>
</div>
{% if page.nickname %}
<div class="license-nickname">
<h3>Nickname</h3>
<p>
{{ page.nickname }}
</p>
</div>
{% endif %}
<div class="how-to-apply">
<h5>How to apply this license</h5>
<h3>How to apply this license</h3>
<p>
{{ page.how | markdownify | remove: '<p>' | remove: '</p>' }}
</p>

2
_licenses/agpl-3.0.txt
View File

@ -6,7 +6,7 @@ family: GNU GPL
variant: true
source: http://www.gnu.org/licenses/agpl-3.0.txt
description: "The GNU GPL family of licenses is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. GNU AGPLv3 is distinguished from GNU GPLv3 in that hosted services using the code are considered distribution and trigger the copyleft requirements."
description: The GNU GPL family of licenses is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. GNU AGPLv3 is distinguished from GNU GPLv3 in that hosted services using the code are considered distribution and trigger the copyleft requirements.
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.

2
_licenses/bsd-2-clause.txt
View File

@ -6,7 +6,7 @@ family: BSD
variant: true
source: http://opensource.org/licenses/BSD-2-Clause
description: A permissive license that comes in two variants, the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license.
description: A permissive license that comes in two variants, the <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause/">BSD 3-Clause</a>. Both have very minute differences to the MIT license.
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.

2
_licenses/bsd-3-clause-clear.txt
View File

@ -3,7 +3,7 @@ title: BSD 3-clause Clear License
family: BSD
variant: true
description: A permissive license that comes in two variants, the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license. The three clause variant prohibits others from using the name of the project or its contributors to promote derivative works without written consent.
description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a> that explicitly does not grant any patent rights.
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. Replace [project] with the project organization, if any, that sponsors this work.

2
_licenses/bsd-3-clause.txt
View File

@ -5,7 +5,7 @@ family: BSD
variant: true
source: http://opensource.org/licenses/BSD-3-Clause
description: A permissive license that comes in two variants, the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license. The three clause variant prohibits others from using the name of the project or its contributors to promote derivative works without written consent.
description: A permissive license similar to the <a href="/licenses/bsd-2-clause/">BSD 2-Clause License</a>, but with a 3rd clause that prohibits others from using the name of the project or its contributors to promote derived products without written consent.
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. Replace [project] with the project organization, if any, that sponsors this work.

2
_licenses/isc.txt
View File

@ -3,7 +3,7 @@ title: ISC License
family: BSD
source: http://opensource.org/licenses/isc-license
description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/mit">MIT</a> licenses, removing some language that is no longer necessary.
description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/mit/">MIT</a> licenses, removing some language that is no longer necessary.
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.

2
_licenses/lgpl-3.0.txt
View File

@ -5,7 +5,7 @@ redirect_from: /licenses/lgpl-v3/
family: GNU LGPL
source: http://www.gnu.org/licenses/lgpl-3.0.txt
description: Version 3 of the GNU LGPL is an additional set of permissions to the <a href="/licenses/gpl-3.0">GNU GPLv3 license</a> that requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction.
description: Version 3 of the GNU LGPL is an additional set of permissions to the <a href="/licenses/gpl-3.0/">GNU GPLv3 license</a> that requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction.
how: This license is an additional set of permissions to the <a href="/licenses/gpl-3.0">GNU GPLv3</a> license. Follow the instructions to apply the GNU GPLv3. Then either paste this text to the bottom of the created file OR add a separate file (typically named COPYING.lesser or LICENSE.lesser) in the root of your source code and copy the text.

2
_licenses/ms-pl.txt
View File

@ -3,7 +3,7 @@ title: Microsoft Public License
source: http://opensource.org/licenses/ms-pl
description: "Microsoft Open Source"
description: An open source license with a patent grant.
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.

3
_licenses/ms-rl.txt
View File

@ -3,11 +3,12 @@ title: Microsoft Reciprocal License
source: http://opensource.org/licenses/ms-pl
description: "Microsoft Open Source"
description: An open source license with a patent grant similar to the <a href="/licenses/ms-pl/">Microsoft Public License</a>, with the additional condition that any source code for any derived file be provided under this license.
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.
conditions:
- disclose-source
- include-copyright
- same-license

26
assets/css/application.scss
View File

@ -284,32 +284,6 @@ strong {
width: 100%;
}
.sidebar .how-to-apply {
font-size: 12px;
margin-top: -15px;
}
.sidebar .how-to-apply p {
line-height: 1.5;
}
.sidebar .how-to-apply p:last-child {
margin-bottom: 0;
}
.sidebar .note {
font-style: italic;
}
.sidebar .source {
margin-top: 4px;
margin-bottom: 30px;
}
.sidebar .boilerplate {
font: 0.7em "Courier new", courier;
}
.button {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;