Simplify license links

6 files changed, 16 insertions, 61 deletions

diff --git a/src/components/landing/sections/Publications.tsx b/src/components/landing/sections/Publications.tsx
index 068ec49..33f989f 100644
--- a/src/components/landing/sections/Publications.tsx
+++ b/src/components/landing/sections/Publications.tsx
@@ -20,11 +20,7 @@ import {
 import Section from '@site/src/components/landing/Section';
 import Subtitle from '@site/src/components/landing/Subtitle';
 import authorizedLinks from '@site/src/components/landing/sections/authorizedLinks';
-import {
-  CCLicenseLink,
-  ClosedAccessLink,
-  LicenseLink,
-} from '@site/src/components/licenses';
+import { CCLicenseLink, ClosedAccessLink } from '@site/src/components/licenses';
 
 import styles from './Publications.module.css';
 
@@ -129,14 +125,6 @@ function OpenAccess({ license }: { license: string }) {
   );
 }
 
-function ArtifactLicense({ license, url }: { license: string; url: string }) {
-  return (
-    <LicenseLink to={url} label="Artifact license">
-      {license}
-    </LicenseLink>
-  );
-}
-
 export default function Publications() {
   return (
     <Section id="publications" title="Publications">
@@ -164,15 +152,11 @@ export default function Publications() {
               </i>{' '}
               pp.&nbsp;433&ndash;45. <DOILink doi="10.1145/3550355.3552448" />{' '}
               <PDFLink filename="models22" />{' '}
+              <ArtifactLink doi="10.5281/zenodo.6974248" />{' '}
               <ClosedAccess
                 publisher="ACM"
                 url="https://authors.acm.org/journals/rights-permissions"
                 authorizedURL={authorizedLinks.models22}
-              />{' '}
-              <ArtifactLink doi="10.5281/zenodo.6974248" />{' '}
-              <ArtifactLicense
-                license="EPL-2.0"
-                url="https://www.eclipse.org/legal/epl-v20.html"
               />
             </li>
             <li className={styles.publications__item}>
@@ -225,15 +209,11 @@ export default function Publications() {
               </i>{' '}
               pp.&nbsp;323&ndash;333. <DOILink doi="10.1145/3239372.3239412" />{' '}
               <PDFLink filename="models18" />{' '}
+              <ArtifactLink doi="10.5281/zenodo.1318156" />{' '}
               <ClosedAccess
                 publisher="ACM"
                 url="https://authors.acm.org/journals/rights-permissions"
                 authorizedURL={authorizedLinks.models18}
-              />{' '}
-              <ArtifactLink doi="10.5281/zenodo.1318156" />{' '}
-              <ArtifactLicense
-                license="EPL-1.0"
-                url="https://www.eclipse.org/legal/epl-v10.html"
               />
             </li>
           </ul>
diff --git a/src/components/landing/sections/Resume.module.css b/src/components/landing/sections/Resume.module.css
index b1ae29e..291d66c 100644
--- a/src/components/landing/sections/Resume.module.css
+++ b/src/components/landing/sections/Resume.module.css
@@ -133,15 +133,6 @@
   color: var(--ifm-color-emphasis-500);
 }
 
-.cv__muted-link {
-  --ifm-link-color: var(--ifm-color-secondary-contrast-foreground);
-  --ifm-link-hover-color: var(--ifm-link-color);
-}
-
-[data-theme='dark'] .cv__muted-link {
-  --ifm-link-color: var(--ifm-color-emphasis-500);
-}
-
 .cv__activities {
   margin: 1em 0;
 }
diff --git a/src/components/landing/sections/Resume.tsx b/src/components/landing/sections/Resume.tsx
index 19f0c20..a7708bf 100644
--- a/src/components/landing/sections/Resume.tsx
+++ b/src/components/landing/sections/Resume.tsx
@@ -42,18 +42,13 @@ function Education() {
             </Link>
           </p>
           <p className={styles.cv__muted}>
-            <Link
-              to="/license#restricted-content"
-              className={styles['cv__muted-link']}
-            >
-              <Lock
-                weight="bold"
-                aria-hidden="true"
-                className={styles['thesis-rights__icon']}
-              />
-              Some poritions may be exclusively licensed to their original
-              publishers
-            </Link>
+            <Lock
+              weight="bold"
+              aria-hidden="true"
+              className={styles['thesis-rights__icon']}
+            />
+            Some poritions may be exclusively licensed to their original
+            publishers
           </p>
           <div className={styles['thesis-links']}>
             <Link
diff --git a/src/components/licenses.module.css b/src/components/licenses.module.css
index ac6c4cc..512efbb 100644
--- a/src/components/licenses.module.css
+++ b/src/components/licenses.module.css
@@ -4,16 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-.link {
-  white-space: nowrap;
-  --ifm-link-color: var(--ifm-color-secondary-contrast-foreground);
-  --ifm-link-hover-color: var(--ifm-link-color);
-}
-
-[data-theme='dark'] .link {
-  --ifm-link-color: var(--ifm-color-emphasis-500);
-}
-
 .icon {
   vertical-align: text-top;
   width: 1em;
diff --git a/src/components/licenses.tsx b/src/components/licenses.tsx
index 85b0cb2..f038b5f 100644
--- a/src/components/licenses.tsx
+++ b/src/components/licenses.tsx
@@ -15,7 +15,7 @@ export type LicenseLinkProps = LinkProps & { label?: string };
 
 export function LicenseLink({ children, label, ...props }: LicenseLinkProps) {
   return (
-    <Link className={styles.link} {...props}>
+    <Link {...props}>
       <Certificate weight="bold" aria-hidden="true" className={styles.icon} />
       <span className="sr-only">{label ?? 'License'}: </span>
       {children}
@@ -29,7 +29,7 @@ export function MITLicenseLink() {
 
 export function CCLicenseLink({ children, label, ...props }: LicenseLinkProps) {
   return (
-    <Link className={styles.link} {...props}>
+    <Link {...props}>
       <CreativeCommonsIcon className={styles.icon} hidden />
       <span className="sr-only">{label ?? 'Creative Commons license'}: </span>
       {children}
@@ -51,7 +51,7 @@ export function ClosedAccessLink({
   ...props
 }: LicenseLinkProps) {
   return (
-    <Link className={styles.link} {...props}>
+    <Link {...props}>
       <Lock weight="bold" aria-hidden="true" className={styles.icon} />
       <span className="sr-only">{label ?? 'Closed access'}: </span>
       {children}
diff --git a/src/pages/license.mdx b/src/pages/license.mdx
index 40f8351..76be841 100644
--- a/src/pages/license.mdx
+++ b/src/pages/license.mdx
@@ -8,7 +8,6 @@ import {
   CCBYLicenseLink,
   CCLicenseLink,
   CCLicenseText,
-  ClosedAccessLink,
   ClosedAccessText,
   LicenseLink,
   LicenseText,
@@ -37,7 +36,7 @@ However, re-using restricted content will need prior permission from the copyrig
 
 ### Restricted content
 
-Restricted content on this site marked with the <ClosedAccessLink to="#content">lock icon</ClosedAccessLink> includes the following:
+Restricted content on this site marked with the <ClosedAccessText to="#content">lock icon</ClosedAccessText> includes the following:
 
 - The photo of me appearing on the [home page](/) was taken by [SPOT Fotókör](https://spot.sch.bme.hu/) in 2019 for the [Critical Systems Research Group](https://ftsrg.mit.bme.hu/).
 
@@ -58,8 +57,8 @@ Code for this site is available at https://git.marussy.com/blog/ under the <MITL
 Files with [restricted content](#restricted-content) were replaced by placeholders or omitted entirely.
 
 I follow the [REUSE Specification – Version 3.0](https://reuse.software/spec/) to declare copyright and licensing for each individual file.
-In particular, files which contain _both code and content_ (e.g., content inside complex JSX components) have the [SPDX License identifier](https://spdx.org/ids) `MIT AND CC-BY-4.0` to signify that they are both <MITLicenseLink /> and <CCBYLicenseLink />.
-If you use only code or only content from such files, you only need to abide by the _corresponding license_ (<MITLicenseLink /> or <CCBYLicenseLink />, respectively).
+In particular, files which contain _both code and content_ (e.g., content inside complex JSX components) have the [SPDX License identifier](https://spdx.org/ids) `MIT AND CC-BY-4.0` to signify that they are both MIT and CC-BY-4.0.
+If you use only code or only content from such files, you only need to abide by the _corresponding license_ (MIT or CC-BY-4.0, respectively).
 
 The site also uses the following third-party code available under libre licenses: