Merge remote-tracking branch 'origin/gh-pages' into home-reform

Author: mlinksva

appendix.md

@@ -5,7 +5,9 @@ title: Appendix
 class: license-types
 ---
 
-All licenses described in the choosealicense.com [repository](https://github.com/github/choosealicense.com), in a table.
+For reference, all licenses described in the choosealicense.com [repository](https://github.com/github/choosealicense.com), in a table.
+
+If you're here to choose a license, **[start from the home page](/)** to see a few licenses that will work for most cases.
 
 <table border style="font-size: xx-small">
 {% assign types = "permissions|conditions|limitations" | split: "|" %}
@@ -56,11 +58,11 @@ All licenses described in the choosealicense.com [repository](https://github.com
 
 ## Legend
 
-<p>Open source licenses grant to the public <b>permissions</b> (<span class="license-permissions"><span class="license-sprite"></span></span>) to do things with licensed works copyright or other "intellectual property" laws might otherwise disallow.</p>
+<p>Open source licenses grant to the public <span class="license-permissions"><span class="license-sprite"></span></span> <b>permissions</b> to do things with licensed works copyright or other "intellectual property" laws might otherwise disallow.</p>
 
-<p>Most open source licenses' grants of permissions are subject to compliance with <b>conditions</b> (<span class="license-conditions"><span class="license-sprite"></span></span>).</p>
+<p>Most open source licenses' grants of permissions are subject to compliance with <span class="license-conditions"><span class="license-sprite"></span></span> <b>conditions</b>.</p>
 
-<p>Most open source licenses also have <b>limitations</b> (<span class="license-limitations"><span class="license-sprite"></span></span>) that usually disclaim warranty and liability and sometimes expressly exclude patent or trademark from licenses' grants.</p>
+<p>Most open source licenses also have <span class="license-limitations"><span class="license-sprite"></span></span> <b>limitations</b> that usually disclaim warranty and liability and sometimes expressly exclude patent or trademark from licenses' grants.</p>
 
 <dl>
 {% assign seen_tags = '' %}

assets/css/application.scss

@@ -66,6 +66,10 @@ strong {
   color: #444;
 }
 
+:target {
+  background-color: yellow;
+}
+
 .container {
   margin: 40px auto;
   width: 940px;
@@ -146,7 +150,7 @@ strong {
 
 .license-overview {
   clear: both;
-  margin-bottom: 50px;
+  margin-bottom: 40px;
 }
 
 .license-overview-heading {

licenses.html

@@ -5,7 +5,8 @@
 title: Licenses
 ---
 
-<p style="margin-bottom:50px">Open source licenses grant permission to everyone to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are arranged from one with the strongest of these conditions (GNU AGPLv3) to one with no conditions (Unlicense). Notice that the popular licenses featured on the <a href="/">home page</a> (GNU GPLv3 and MIT) fall within this spectrum.</p>
+<p>Open source licenses grant permission to everyone to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are arranged from one with the strongest of these conditions (GNU AGPLv3) to one with no conditions (Unlicense). Notice that the popular licenses featured on the <a href="/">home page</a> (GNU GPLv3, Apache License 2.0, and MIT License) fall within this spectrum.</p>
+<p style="font-size:small; margin-bottom: 40px">If you were looking for a reference table of all of the licenses on choosealicense.com, see the <a href="/appendix">appendix</a>.</p>
 
 {% include license-overview.html license-id="agpl-3.0" %}
 {% include license-overview.html license-id="gpl-3.0" %}