From f2866a23a3a72ee494eec6a5e1e401e16fe80be2 Mon Sep 17 00:00:00 2001 From: James Wilson <jrwilson3@gmail.com> Date: Thu, 27 Mar 2025 15:11:47 -0500 Subject: [PATCH 1/4] Correct license in package.json for Drupal.org hosting requirements --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cb0002a..7021156 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "rivet", "version": "1.0.0", - "license": "BSD-3-Clause", + "license": "GPL-2.0+", "description": "An implementation of Indiana University's <a href='https://rivet.iu.edu'>Rivet Design System</a> for Drupal.", "author": "James Wilson <jrwilson3@gmail.com>", "devDependencies": { -- GitLab From 3140167faa7fb4e66fd9e708048d1a3ecbd54ff8 Mon Sep 17 00:00:00 2001 From: James Wilson <jrwilson3@gmail.com> Date: Thu, 27 Mar 2025 15:15:13 -0500 Subject: [PATCH 2/4] Add credits and mention license in Readme --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index fcc1dae..da27ab2 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,10 @@ Use the following command: [//]: # Do not add maintainers to cspell-project-words file * James Wilson - [jwilson3](https://www.drupal.org/u/jwilson3) + +## Credits + +This theme uses Sass variables and mixins from the +[Rivet Design System](https://github.com/indiana-university/rivet-source) +(BSD-3-Clause License) to compile Rivet-compatible custom CSS components, +but does not redistribute Rivet code. -- GitLab From 0f4f1abcc5a063a6250f1c09d530af522c77be6a Mon Sep 17 00:00:00 2001 From: James Wilson <jrwilson3@gmail.com> Date: Thu, 27 Mar 2025 15:23:02 -0500 Subject: [PATCH 3/4] Add rivet-source license info to libraries.yml --- rivet.libraries.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rivet.libraries.yml b/rivet.libraries.yml index 0180e87..f06bc56 100644 --- a/rivet.libraries.yml +++ b/rivet.libraries.yml @@ -1,4 +1,10 @@ core: + remote: https://github.com/indiana-university/rivet-source + version: 2.8.1 + license: + name: BSD-3-Clause + url: https://github.com/indiana-university/rivet-source/blob/2.0.0-master/LICENSE.md + gpl-compatible: true css: base: # NOTE: when bumping Rivet dependency, remember to also bump ckeditor.css! -- GitLab From 49ddaad75612eec17bb27cf1e4b5d162697d9fe4 Mon Sep 17 00:00:00 2001 From: James Wilson <jrwilson3@gmail.com> Date: Thu, 27 Mar 2025 15:37:49 -0500 Subject: [PATCH 4/4] Mention remote CDN asssets from Rivet core in credits --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index da27ab2..5eef4a8 100644 --- a/README.md +++ b/README.md @@ -61,5 +61,6 @@ Use the following command: This theme uses Sass variables and mixins from the [Rivet Design System](https://github.com/indiana-university/rivet-source) -(BSD-3-Clause License) to compile Rivet-compatible custom CSS components, -but does not redistribute Rivet code. +(BSD-3-Clause License) to compile Rivet-compatible custom CSS components, but +does not redistribute Rivet code. Rivet's core CSS and JS assets are pulled +directly from CDN into all rendered website pages. -- GitLab