From 57a1b0799760aeb3f1057d7ef50ec27e7b9e5018 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 22 Apr 2016 11:35:31 -0700 Subject: [PATCH 01/12] rm symlinks, maybe fix #383 (Windows build) Not certain this is right thing to do, but https://jekyllrb.com/docs/assets/ says "Note that the sass_dir becomes the load path for Sass imports, nothing more" so setting it to `assets/vendor` and changing imports accordingly ought and seems to work without disturbing other files under `assets/vendor`, even though the docs continue "This folder should only contain imports." --- _config.yml | 2 +- _sass/jquery.qtip.scss | 1 - _sass/normalize.scss | 1 - assets/css/application.scss | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 120000 _sass/jquery.qtip.scss delete mode 120000 _sass/normalize.scss diff --git a/_config.yml b/_config.yml index 19edbe1..83c7d2c 100644 --- a/_config.yml +++ b/_config.yml @@ -41,7 +41,7 @@ gems: - jekyll-coffeescript sass: - sass_dir: _sass + sass_dir: assets/vendor style: :compressed twitter: diff --git a/_sass/jquery.qtip.scss b/_sass/jquery.qtip.scss deleted file mode 120000 index a354cd5..0000000 --- a/_sass/jquery.qtip.scss +++ /dev/null @@ -1 +0,0 @@ -../assets/vendor/qtip2/jquery.qtip.css \ No newline at end of file diff --git a/_sass/normalize.scss b/_sass/normalize.scss deleted file mode 120000 index 8bd92d4..0000000 --- a/_sass/normalize.scss +++ /dev/null @@ -1 +0,0 @@ -../assets/vendor/normalize-css/normalize.css \ No newline at end of file diff --git a/assets/css/application.scss b/assets/css/application.scss index c65a15d..dc72f7c 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -1,8 +1,8 @@ --- --- -@import "normalize"; -@import "jquery.qtip"; +@import "normalize-css/normalize.css"; +@import "qtip2/jquery.qtip.css"; body { background: #fafafa; From 4a27230587d6270f595368a9ca067930abc66973 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 22 Apr 2016 15:40:13 -0700 Subject: [PATCH 02/12] skip sass bundling of qtip and normalize --- _config.yml | 1 - assets/css/application.scss | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 83c7d2c..8da0521 100644 --- a/_config.yml +++ b/_config.yml @@ -41,7 +41,6 @@ gems: - jekyll-coffeescript sass: - sass_dir: assets/vendor style: :compressed twitter: diff --git a/assets/css/application.scss b/assets/css/application.scss index dc72f7c..bdd128a 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -1,8 +1,8 @@ --- --- -@import "normalize-css/normalize.css"; -@import "qtip2/jquery.qtip.css"; +@import "/assets/vendor/normalize-css/normalize.css"; +@import "/assets/vendor/qtip2/jquery.qtip.css"; body { background: #fafafa; From 6e6af9b7aad3b9fb38a456449db2a66cb7553a9d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 24 Apr 2016 09:25:24 -0700 Subject: [PATCH 03/12] min version of qtip css --- assets/css/application.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/application.scss b/assets/css/application.scss index bdd128a..020ae91 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -2,7 +2,7 @@ --- @import "/assets/vendor/normalize-css/normalize.css"; -@import "/assets/vendor/qtip2/jquery.qtip.css"; +@import "/assets/vendor/qtip2/jquery.qtip.min.css"; body { background: #fafafa; From abef7e0bab2957c201ab2cbb41ba7b18fc49f2f4 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 25 Apr 2016 15:08:39 -0700 Subject: [PATCH 04/12] state changes missing from 4 licenses which have condition also drop 'significant' from description, does not correspond to any license --- README.md | 2 +- _data/rules.yml | 2 +- _licenses/afl-3.0.txt | 1 + _licenses/lgpl-2.1.txt | 1 + _licenses/lgpl-3.0.txt | 1 + _licenses/osl-3.0.txt | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96fca86..8f96c63 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ The license properties (rules) are stored as a bulleted list within the licenses #### Conditions * `include-copyright` - Include a copy of the license and copyright notice with the code. -* `document-changes` - Indicate significant changes made to the code. +* `document-changes` - Indicate changes made to the code. * `disclose-source` - Source code must be made available when distributing the software. * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code. * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. diff --git a/_data/rules.yml b/_data/rules.yml index 0b56dff..1eee415 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -2,7 +2,7 @@ conditions: - description: Include a copy of the license and copyright notice with the code. label: License and Copyright Notice tag: include-copyright -- description: Indicate significant changes made to the code. +- description: Indicate changes made to the code. label: State Changes tag: document-changes - description: Source code must be made available when distributing the software. diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index a145e35..7332fa5 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -8,6 +8,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of conditions: - include-copyright + - document-changes permissions: - commercial-use diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index cdb428c..7056384 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -13,6 +13,7 @@ note: The Free Software Foundation recommends taking the additional step of addi conditions: - include-copyright - disclose-source + - document-changes - same-license permissions: diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index 13a7d45..e327788 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -13,6 +13,7 @@ note: The Free Software Foundation recommends taking the additional step of addi conditions: - include-copyright - disclose-source + - document-changes - same-license diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index 4e4adaa..f5110cd 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -16,6 +16,7 @@ using: conditions: - include-copyright - disclose-source + - document-changes - network-use-disclose - same-license From 213c5400bc0774b452f8476b4a0532b8dc2a5856 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 26 Apr 2016 12:22:15 -0700 Subject: [PATCH 05/12] re-add 'featured' field was unused for choosealicense.com display after https://github.com/github/choosealicense.com/pull/386 but choosealicense.com is vendored into licensee which eventually is used in GitHub; 'featured' determines what is highlighted in license drop-down eg at https://github.com/new --- README.md | 1 + _data/meta.yml | 4 ++++ _licenses/apache-2.0.txt | 1 + _licenses/gpl-3.0.txt | 1 + _licenses/mit.txt | 1 + 5 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 8f96c63..7e11c16 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc #### Optional fields +* `featured` - Whether the license should be featured on the main page (defaults to false) * `note` - Additional information about the licenses * `using` - A list of notable projects using the license in the form of `project_name: "url"` * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs diff --git a/_data/meta.yml b/_data/meta.yml index 41d0c5c..11b61f7 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -31,6 +31,10 @@ # Optional fields +- name: featured + description: Whether the license should be featured on the main page (defaults to false) + required: false + - name: note description: Additional information about the licenses required: false diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 4fcc6b5..577ad81 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -2,6 +2,7 @@ title: Apache License 2.0 redirect_from: /licenses/apache/ source: http://www.apache.org/licenses/LICENSE-2.0.html +featured: true description: A permissive license that also provides an express grant of patent rights from contributors to users. diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 82268b3..1b4c051 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -3,6 +3,7 @@ title: GNU General Public License v3.0 nickname: GNU GPLv3 redirect_from: /licenses/gpl-v3/ source: http://www.gnu.org/licenses/gpl-3.0.txt +featured: true description: The GNU GPL 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. diff --git a/_licenses/mit.txt b/_licenses/mit.txt index 262a4de..db38c0d 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -1,6 +1,7 @@ --- title: MIT License source: https://opensource.org/licenses/MIT +featured: true description: A permissive license that is short and to the point. It lets people do anything with your code with proper attribution and without warranty. From 78aac74fb22b5d81a8d28ffe0dc74b7f741245d1 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 26 Apr 2016 16:43:40 -0700 Subject: [PATCH 06/12] Restructure individual license pages, added styles to improve alignment --- _includes/sidebar.html | 39 +----------------------------- _layouts/license.html | 48 ++++++++++++++++++++++++++++++++++++- assets/css/application.scss | 10 ++++++++ 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 07f8fb9..fc174ba 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,23 +1,7 @@
Copy license text to clipboard - -
-

Description

-

- {{ page.description }} -

-
- - {% if page.nickname %} -
-

Nickname

-

- {{ page.nickname }} -

-
- {% endif %} - +

How to apply this license

@@ -38,27 +22,6 @@

{% endif %} -
- - {% assign types = "permissions|conditions|limitations" | split: "|" %} - {% for type in types %} -

{{ type | capitalize }}

-
    - {% assign rules = site.data.rules[type] | sort: "label" %} - {% for rule_obj in rules %} - {% assign req = rule_obj.tag %} - {% if page[type] contains req %} -
  • - - {{ rule_obj.label }} -
    • - {% endif %} - {% endfor %} -
- {% endfor %} - -
- {% if page.using %}

Who's using this license?

diff --git a/_layouts/license.html b/_layouts/license.html index 1aea9e7..002f48b 100644 --- a/_layouts/license.html +++ b/_layouts/license.html @@ -1,8 +1,54 @@ {% include header.html %}
+
- 
{{ content | replace:"<", "<" | replace:">", ">" }}
+ + {% if page.nickname %} +

+ {{ page.nickname }} +

+ {% endif %} + +

+ {{ page.description }} +

+ +
+ + + + {% assign types = "permissions|conditions|limitations" | split: "|" %} + {% for type in types %} + + {% endfor %} + + + {% for type in types %} + + {% endfor %} + +
{{ type | capitalize }}
+
    + {% assign rules = site.data.rules[type] | sort: "label" %} + {% for rule_obj in rules %} + {% assign req = rule_obj.tag %} + {% if page[type] contains req %} +
  • + + {{ rule_obj.label }} +
    • + {% endif %} + {% endfor %} +
+
+ +
+ +

License Text

+ + 
{{ content | replace:"<", "<" | replace:">", ">" }}
+
{% include sidebar.html %} diff --git a/assets/css/application.scss b/assets/css/application.scss index 020ae91..227e9aa 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -163,6 +163,12 @@ strong { padding-left: 20px; } +.license-page-details { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + .license-overview-name { font-size: 28px; margin-top: 5px; @@ -265,6 +271,10 @@ strong { padding: 20px; } +.license-nickname { + margin-top: 0; +} + .sidebar { float: right; width: 220px; From 57949d33db51a9d481f078c48785c83633ed823b Mon Sep 17 00:00:00 2001 From: git Date: Wed, 27 Apr 2016 15:55:34 -0700 Subject: [PATCH 07/12] Removed license text header --- _layouts/license.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/_layouts/license.html b/_layouts/license.html index 002f48b..297e827 100644 --- a/_layouts/license.html +++ b/_layouts/license.html @@ -44,8 +44,6 @@
- -

License Text

{{ content | replace:"<", "<" | replace:">", ">" }}
From 458ef6a7b00fa90431222f60fe718167e90d3837 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Thu, 28 Apr 2016 17:51:16 +0100 Subject: [PATCH 08/12] don't use the same color for headings and links changed to a slightly-blue grey, which IMO fits well with the current style. --- assets/css/application.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/application.scss b/assets/css/application.scss index 227e9aa..5380ccd 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -80,7 +80,7 @@ strong { } .home h2 { - color: #149ad4; + color: #687072; font-size: 27px; line-height: 70px; margin-bottom: 45px; From 7eeef34696192304999df77c477effa9ebbf79b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 3 May 2016 11:53:33 +0200 Subject: [PATCH 09/12] Add a note on the recommended boilerplate See the recommendation of the Mozilla Foundation here: https://www.mozilla.org/en-US/MPL/2.0/FAQ/#license-use --- _licenses/mpl-2.0.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index defeb3a..92f8328 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -7,6 +7,8 @@ description: The Mozilla Public License (MPL 2.0) is maintained by the Mozilla f 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. +note: The Mozilla Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license (Exhibit A). + conditions: - disclose-source - include-copyright From f915264bc89c78f7a6420136c0bf01b8eb5dda92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 3 May 2016 12:27:55 +0200 Subject: [PATCH 10/12] Add examples of software under MPL No better links found for Mozilla Firefox and Thunderbird. --- _licenses/mpl-2.0.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index 92f8328..e647b1f 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -9,6 +9,11 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Mozilla Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license (Exhibit A). +using: + - Firefox: http://www.mozilla.org/foundation/licensing.html + - Thunderbird: http://www.mozilla.org/foundation/licensing.html + - LibreOffice: http://www.libreoffice.org/download/license/ + conditions: - disclose-source - include-copyright From a84fc7316646b4f77ea2b04f503711b333aca52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 3 May 2016 17:52:42 +0200 Subject: [PATCH 11/12] Update the link to LibreOffice license file --- _licenses/mpl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index e647b1f..be06726 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -12,7 +12,7 @@ note: The Mozilla Foundation recommends taking the additional step of adding a b using: - Firefox: http://www.mozilla.org/foundation/licensing.html - Thunderbird: http://www.mozilla.org/foundation/licensing.html - - LibreOffice: http://www.libreoffice.org/download/license/ + - LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL conditions: - disclose-source From 1f667089c72cd482ff7fa8c1271b932980594517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 3 May 2016 22:53:25 +0200 Subject: [PATCH 12/12] Highlight projects with simpler licensing practices --- _licenses/mpl-2.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index be06726..a725813 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -10,8 +10,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Mozilla Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license (Exhibit A). using: - - Firefox: http://www.mozilla.org/foundation/licensing.html - - Thunderbird: http://www.mozilla.org/foundation/licensing.html + - Servo: https://github.com/servo/servo/blob/master/LICENSE + - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE - LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL conditions: