Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/content' into content
Browse files Browse the repository at this point in the history
  • Loading branch information
valeriibudko committed Feb 11, 2023
2 parents 4a5dc0c + 61d2f66 commit c3bec60
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 9 deletions.
1 change: 1 addition & 0 deletions core.routes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ team: ~about#team
internships: ~about#internships
endorsements: ~about/endorsements
faq: /faq
disclaimer: ~terms#disclaimer
research-outputs: ~about/research-outputs
contact: ~about#contact
accessibility: /accessibility
Expand Down
4 changes: 2 additions & 2 deletions data/terms.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
header:
title: Terms & Conditions
description: This page sets the Terms & Conditions under which [CORE data*](https://core.ac.uk/terms) <br> can be used by others.
description: This page sets the Terms & Conditions under which [CORE data*](~terms#disclaimer) <br> can be used by others.
actions:
- caption: Download pdf
url: /resources/flyer-CORE-Sponsorship.pdf
url: /resources/core-terms-conditions.pdf
variant: contained
target: _blank
main:
Expand Down
13 changes: 13 additions & 0 deletions pages/terms/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react'

import textData from '../../data/terms.yml'
import { Page } from '../../components'
import TermsPageTemplate from '../../templates/term'

const TermsPage = () => (
<Page title={textData.header.title} description={textData.header.description}>
<TermsPageTemplate data={textData} />
</Page>
)

export default TermsPage
Binary file added public/resources/core-terms-conditions.pdf
Binary file not shown.
4 changes: 3 additions & 1 deletion templates/sponsorships/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ const SponsorshipPageTemplate = ({ data }) => (
</div>
<div className={styles.itemGroup}>
{data.howToSponsor.types.map((type) => (
<div className={styles.groupItem}>{type.title}</div>
<div key={type.title} className={styles.groupItem}>
{type.title}
</div>
))}
</div>
</Section>
Expand Down
8 changes: 4 additions & 4 deletions templates/term/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Markdown } from '../../components'

const TermsPageTemplate = ({ data }) => (
<Layout>
<Section id="metadata" className={styles.header}>
<Section id="termsPage" className={styles.header}>
<div>
<h2 className={styles.title}>{data.header.title}</h2>
<Markdown className={styles.description}>
Expand All @@ -31,22 +31,22 @@ const TermsPageTemplate = ({ data }) => (
<div className={styles.contentWrapper}>
<div className={styles.contentItem}>
{data.main[0].mainItems.map((mainItem) => (
<div className={styles.item}>
<div key={mainItem.title} className={styles.item}>
<h2 className={styles.mainTitle}>{mainItem.title}</h2>
<Markdown>{mainItem.content}</Markdown>
</div>
))}
</div>
<div className={styles.contentItem}>
{data.main[1].mainItems.map((mainItem) => (
<div className={styles.item}>
<div key={mainItem.title} className={styles.item}>
<h2 className={styles.mainTitle}>{mainItem.title}</h2>
<Markdown>{mainItem.content}</Markdown>
</div>
))}
</div>
</div>
<div className={styles.additionalItem}>
<div className={styles.additionalItem} id="disclaimer">
<h2 className={styles.mainTitle}>{data.additional.title}</h2>
<Markdown>{data.additional.content}</Markdown>
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/term/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
.main-title {
font-style: normal;
font-weight: 500;
font-weight: bold;
font-size: 24px;
line-height: 24px;
color: #212121;
Expand All @@ -51,7 +51,7 @@
margin-bottom: 65px;
.main-title {
font-style: normal;
font-weight: 500;
font-weight: bold;
font-size: 24px;
line-height: 24px;
color: #212121;
Expand Down

0 comments on commit c3bec60

Please sign in to comment.