Skip to content

Commit dfa35b3

Browse files
vkot91valeriibudko
vkot91
and
valeriibudko
authored
Core 4346/update services page (#683)
* Fix/benefits title text issue (#679) * Core 4204/implement consultancy service page (#660) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update/data page text (#565) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update texts on data page Co-authored-by: valerii <[email protected]> * Update/adri quote (#578) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update/data page text (#565) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update texts on data page Co-authored-by: valerii <[email protected]> * Add quote,fix text on dataset and api page, fix container problems(temporary) Co-authored-by: valerii <[email protected]> * Update/home page funders (#588) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update/data page text (#565) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update texts on data page Co-authored-by: valerii <[email protected]> * Update/adri quote (#578) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update/data page text (#565) * Added new collection to netlify CMS for the community * Add posibility to delete single quote * Improve logic of creating single quote * Update logic of creating single quote (#410) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Revert "OAI resolver page (#467)" (#479) (#482) This reverts commit 9d954a5. * Core 4126/Update home page (#470) * Init new home page design * Fix old styles * Update text * Update hero image,testimonial,design version * Refresh all packages * Fix features styles * Revert "OAI resolver page (#467)" (#479) This reverts commit 9d954a5. * Restore next.config.js * Update links Co-authored-by: Valeriy Budko <[email protected]> * Update texts on data page Co-authored-by: valerii <[email protected]> * Add quote,fix text on dataset and api page, fix container problems(temporary) Co-authored-by: valerii <[email protected]> * Update funders section Co-authored-by: valerii <[email protected]> * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Create logo.svg * Init new api page * Fix/services page hero (#604) * Revert "Oai resolver update (#468)" (#478) This reverts commit 399dbed. * Revert "oai resolve page (#466)" (#480) This reverts commit 449ff4b. * Create logo.svg * fix images Co-authored-by: Valeriy Budko <[email protected]> * Init new consultancy page * Delete comments * Update styles Co-authored-by: valerii <[email protected]> * Fix text issue in title Co-authored-by: valerii <[email protected]> * Update services page,fix body scroll on the main page * Combine categories with 1 card * Change columns order Co-authored-by: valerii <[email protected]>
1 parent d138088 commit dfa35b3

File tree

8 files changed

+72
-26
lines changed

8 files changed

+72
-26
lines changed

‎data/services.yml‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,29 @@ sections:
127127
action:
128128
caption: Learn more
129129
url: services/discovery
130+
-
131+
id: oai-identifies
132+
title: OAI identifiers
133+
features:
134+
-
135+
id: oai-resover
136+
title: OAI Resolver
137+
logo: /images/oai_resolve/logo.svg
138+
short-description: Monitor and improve your repository output
139+
description: |
140+
Make OAI identifiers originating from your repository resolve
141+
directly to your repository, turning them into free-to-mint
142+
unique persistent identifiers (PIDs) for open access papers.
143+
recommender:
144+
-
145+
title: Academic institutions
146+
-
147+
title: Funders
148+
-
149+
title: Publishers
150+
action:
151+
caption: Learn more
152+
url: documentation/oai-resolver
130153
-
131154
id: managing-content
132155
title: Managing content
@@ -147,18 +170,26 @@ sections:
147170
action:
148171
caption: Learn more
149172
url: services/repository-dashboard
173+
-
174+
id: contracts
175+
title: Bespoke contracts
176+
features:
150177
-
151-
id: repository-edition
152-
title: Repository Edition
153-
logo: /images/services/repository-edition.svg
154-
short-description: Enhance your repository’s discoverability
178+
id: consultancy
179+
title: Consultancy services
180+
logo: /images/services/consultancy.svg
181+
short-description: Consultancy services for users
155182
description: |
156-
Provide guaranteed support levels to enable repositories
157-
to gain maximum exposure for their content and help ensure
158-
compliance with Open Access policies.
183+
Helping organisations to analyse and derive value from large
184+
amounts of research data, empowering them to understand,
185+
interpret and build on new knowledge.
159186
recommender:
160187
-
161-
title: Academic institutions
188+
title: Companies
189+
-
190+
title: Funders
191+
-
192+
title: Academic insitutions
162193
action:
163194
caption: Learn more
164-
url: services/repository-edition
195+
url: services/consultancy

‎design-v2/components/layout/styles.module.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
.full {
1515
position: relative;
16-
width: 100vw;
16+
width: 99.5vw;
1717
height: 100%;
1818
margin-left: -50vw;
1919
left: 50%;

‎package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"prettier": "^2.1.2"
3838
},
3939
"dependencies": {
40-
"@oacore/design": "latest",
40+
"@oacore/design": "^4.7.8",
4141
"@octokit/rest": "^18.5.0",
4242
"bootstrap": "^4.5.3",
4343
"camelize": "^1.0.0",

‎pages/index.jsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ const IndexPage = () => (
107107
)}
108108
</KeyFeatureList>
109109
</Section>
110-
111-
<Section className={styles.sectionJoin}>
110+
<Section className={styles.sectionJoin} useFullPageWidth>
112111
<h3 className={styles.title}>{page.join.title}</h3>
113112
<JoinList className={styles.sectionJoinList}>
114113
{page.join.children.map(({ caption, url, picture }) => (

‎pages/index.module.scss‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,12 @@
4949

5050
.section {
5151
&-join {
52-
position: relative;
5352
background-color: var(--gray-200);
54-
width: 100vw;
55-
margin-left: -50vw;
56-
left: 50%;
53+
div {
54+
padding: unset;
55+
}
5756
&-list {
58-
padding: 0 var(--page-padding-x);
57+
padding: 0 var(--page-padding-x) !important;
5958
}
6059
}
6160
&-services {

‎pages/services/index.jsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react'
22
import { Card, Button } from '@oacore/design/lib/elements'
3+
import { classNames } from '@oacore/design/lib/utils'
34

45
import styles from './services.module.scss'
56

@@ -32,7 +33,12 @@ const FeaturesSection = ({ id, description, title, video, features }) => {
3233
const [visibleVideo, setVisibleVideo] = React.useState(false)
3334

3435
return (
35-
<Section className={styles.sectionContainer} id={id}>
36+
<Section
37+
className={classNames.use(styles.sectionContainer, {
38+
[styles.sectionContainerInline]: features.length === 1,
39+
})}
40+
id={id}
41+
>
3642
<div className={styles.sectionHeader}>
3743
{video && (
3844
<button

‎pages/services/services.module.scss‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
.section {
66
&-container {
77
padding: 1rem 0 !important;
8+
&-inline {
9+
display: inline-flex;
10+
flex-direction: column;
11+
justify-content: stretch;
12+
max-width: 25.35rem;
13+
14+
&:not(:last-child) {
15+
margin-right: 1rem;
16+
}
17+
}
818
}
919
&-header {
1020
display: flex;
@@ -44,6 +54,7 @@
4454
background-color: var(--gray-100);
4555
display: flex;
4656
flex-direction: column;
57+
min-height: 29rem;
4758
&-logo {
4859
width: 96px;
4960
height: 63px;

0 commit comments

Comments
 (0)