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

Merge pull request #89 from github/cc

Add FAQ re: non-code projects
This commit is contained in:
Phil Haack 2013-09-16 13:03:33 -07:00
commit a5f4538c00
2 changed files with 53 additions and 36 deletions

View File

@ -190,37 +190,38 @@ strong {
top: 10px;
}
.situations {
.triptych {
width: 900px;
margin: 0 auto;
margin: 0 auto 20px;
}
.situations li {
.triptych li {
width: 280px;
float: left;
margin-left: 27px;
text-align: center;
}
.situations .whatever {
.triptych li:first-child {
margin-left: 0;
margin-top: 16px;
}
.situations .copyleft {
margin-top: 3px;
}
.situations h3 {
margin: 0 auto 20px auto;
width: 220px;
}
.situations h3 a {
.triptych li > a {
text-decoration: none;
}
.triptych h3 {
color: #443a33;
font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
font-size: 22px;
font-weight: 900;
line-height: 1.1;
margin: 0 auto 20px auto;
width: 220px;
}
.situations .whatever {
margin-top: 16px;
}
.situations .copyleft {
margin-top: 3px;
}
.situations .button {
margin-top: 20px;
}
@ -236,16 +237,6 @@ strong {
color: #5c5855;
padding: 16px;
}
.see-more {
margin-top: 20px;
display: inline-block;
padding-left: 80px;
padding-right: 80px;
font-weight: bold;
}
.see-more p:last-child {
margin-bottom: 0.3em;
}
.license-rules {
font-size: 13px;

View File

@ -11,10 +11,12 @@ description: A site to provide non-judgmental guidance on choosing a license for
Which of the following best describes your situation?
<span>}</span>
</h2>
<ul class="situations cf">
<ul class="triptych situations cf">
<li class='whatever'>
<a href="licenses/mit"><img height='57' src='images/three-arrows@2x.png' width='72'></a>
<h3><a href="licenses/mit">I want it simple and permissive.</a></h3>
<a href="licenses/mit">
<img height='57' src='images/three-arrows@2x.png' width='72'>
<h3>I want it simple and permissive.</h3>
</a>
<p>
The <a href="licenses/mit">MIT License</a> is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and dont hold you liable.
</p>
@ -23,8 +25,10 @@ description: A site to provide non-judgmental guidance on choosing a license for
</p>
</li>
<li class='patents'>
<a href="licenses/apache"><img height='72' src='images/lightbulb@2x.png' width='43'></a>
<h3><a href="licenses/apache">Im concerned about patents.</a></h3>
<a href="licenses/apache">
<img height='72' src='images/lightbulb@2x.png' width='43'>
<h3>Im concerned about patents.</h3>
</a>
<p>
The <a href="licenses/apache/">Apache License</a> is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.
</p>
@ -33,8 +37,10 @@ description: A site to provide non-judgmental guidance on choosing a license for
</p>
</li>
<li class='copyleft'>
<a href="licenses/gpl-v2"><img height='69' src='images/circular@2x.png' width='72'></a>
<h3><a href="licenses/gpl-v2">I care about sharing improvements.</a></h3>
<a href="licenses/gpl-v2">
<img height='69' src='images/circular@2x.png' width='72'>
<h3>I care about sharing improvements.</h3>
</a>
<p>
The GPL (<a href="licenses/gpl-v2">V2</a> or <a href="licenses/gpl-v3">V3</a>) is a copyleft license that requires anyone who distributes your code or a derivative work to make the source available under the same terms. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.
</p>
@ -43,8 +49,28 @@ description: A site to provide non-judgmental guidance on choosing a license for
</p>
</li>
</ul>
<div class="see-more callout">
<p>What if none of these work for me or I want to retain all of my rights? <a href="licenses">More licenses are available</a>.</p>
<p>What if I don't want to choose a license? <a href="no-license">You don't have to</a>.</p>
</div>
<h2>
<span>{</span>
What if none of these work for me?
<span>}</span>
</h2>
<ul class="triptych see-more cf">
<li>
<h3>My content isn't code.</h3>
<p>
Check out <a href="http://creativecommons.org/choose/">Creative Commons</a>.
</p>
</li>
<li>
<h3>I want more choices.</h3>
<p>
<a href="licenses">More licenses are available</a>.
</p>
</li>
<li>
<h3>I don't want to choose a license.</h3>
<p>
<a href="no-license">You don't have to</a>.
</p>
</li>
</ul>