Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: set default layout for projects in cms #75

Merged
merged 10 commits into from
Jan 20, 2025
Merged

fix: set default layout for projects in cms #75

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f8b8a6
fix: set default layout for projects in cms
chosww Jan 17, 2025
7ccafa0
fix: update based on PR feedback
chosww Jan 17, 2025
6cf8cc0
fix: project panel margin
chosww Jan 17, 2025
76274af
Merge branch 'dev' into fix/default-project-layout
greatislander Jan 18, 2025
bcaba9c
fix: move project layout out of eleventy computed data
chosww Jan 20, 2025
7a98580
Merge remote-tracking branch 'upstream/fix/default-project-layout' in…
chosww Jan 20, 2025
77f41b1
Revert "Merge remote-tracking branch 'upstream/fix/default-project-la…
chosww Jan 20, 2025
ad98340
Merge remote-tracking branch 'upstream/dev' into fix/default-project-…
chosww Jan 20, 2025
98f46cc
Merge branch 'dev' into fix/default-project-layout
greatislander Jan 20, 2025
c171ef0
Revert "Revert "Merge remote-tracking branch 'upstream/fix/default-pr…
chosww Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/admin/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ collections:
extension: md
create: true
fields:
- { label: Layout, name: layout, widget: hidden, default: layouts/project.njk }
- { label: Title, name: title, widget: string, i18n: true }
- { label: Meta Excerpt (SEO), name: metaExcerpt, widget: text, i18n: true, required: false }
- label: "Project Colour"
Expand Down
5 changes: 5 additions & 0 deletions src/assets/styles/components/_project-panel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ div:has(.project-panel) {
position: relative;
max-width: 75rem;
margin-inline: auto;
margin-block-end: 2rem;
}

.project-panel:last-of-type {
margin-block-end: unset;
}

.project-panel a {
Expand Down
1 change: 0 additions & 1 deletion src/collections/projects/en/all-standards-with-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: All Standards With Us
metaExcerpt: This project makes standards development accessible to people with disabilities and Deaf individuals, ensuring goods and services are inclusive. We focus on removing barriers in Standards Development Organizations (SDOs) to support full participation.
projectColor: yellow
desc: This project makes standards development accessible to people with disabilities and Deaf individuals, ensuring goods and services are inclusive. We focus on removing barriers in Standards Development Organizations (SDOs) to support full participation.
layout: layouts/project
---
## About this project

Expand Down
1 change: 0 additions & 1 deletion src/collections/projects/en/review-of-the-review.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: Review of the Review
metaExcerpt: Review of the Review (RotR) is assisting Accessibility Standards Canada in developing standards development processes and activities that are accessible and inclusively designed.
projectColor: ''
desc: Review of the Review (RotR) is assisting Accessibility Standards Canada in developing standards development processes and activities that are accessible and inclusively designed.
layout: layouts/project
---
## About

Expand Down
1 change: 0 additions & 1 deletion src/collections/projects/fr/all-standards-with-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: All Standards With Us FR
metaExcerpt: This project makes standards development accessible to people with disabilities and Deaf individuals, ensuring goods and services are inclusive. We focus on removing barriers in Standards Development Organizations (SDOs) to support full participation.
projectColor: yellow
desc: This project makes standards development accessible to people with disabilities and Deaf individuals, ensuring goods and services are inclusive. We focus on removing barriers in Standards Development Organizations (SDOs) to support full participation.
layout: layouts/project
---
## About this project

Expand Down
1 change: 0 additions & 1 deletion src/collections/projects/fr/review-of-the-review.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: Review of the Review
metaExcerpt: Review of the Review (RotR) is assisting Accessibility Standards Canada in developing standards development processes and activities that are accessible and inclusively designed.
projectColor: ''
desc: Review of the Review (RotR) is assisting Accessibility Standards Canada in developing standards development processes and activities that are accessible and inclusively designed.
layout: layouts/project
---
## About

Expand Down
1 change: 1 addition & 0 deletions src/collections/projects/projects.11tydata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { __, generatePermalink } from "eleventy-plugin-fluid";

export default {
eleventyComputed: {
layout: "layouts/project",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually doesn't need to be computed so it can be moved outside the eleventyComputed block. See here: https://www.11ty.dev/docs/data-js/

permalink: (data) => {
if (data.link) {
return null;
Expand Down