Skip to content

Commit

Permalink
Merge pull request #2 from uk-tre/further-development
Browse files Browse the repository at this point in the history
Lots of small updates
  • Loading branch information
manics authored Jan 31, 2024
2 parents f9a9ca3 + 0658b25 commit c9431a1
Show file tree
Hide file tree
Showing 49 changed files with 999 additions and 35 deletions.
Binary file modified .DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"files.autoSave": "onFocusChange",
"editor.formatOnSave": true
}
2 changes: 1 addition & 1 deletion assets/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@

// 8. Add additional custom code here
@import "custom"; // Theme SASS
@import "styles"; // Site SASS (assets/sass/styles.scss)
@import "styles"; // Site SASS (assets/sass/styles.scss)
24 changes: 17 additions & 7 deletions assets/sass/styles.scss
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
// Colours

:root {
--primary-colour: #0ee;
--secondary-colour: #07e;
--tertiary-colour: #0e7;
--primary-colour: #3CC;
--secondary-colour: #3380CC;
--tertiary-colour: #33CC80;
}

.padded {
margin-bottom: 5rem !important;
}

.navbar {

padding: .75rem 0;
background-color: #33ffff;
background-color: var(--primary-colour);
background-image: linear-gradient(to bottom, rgba(var(--bd-violet-rgb), 1), rgba(var(--bd-violet-rgb), 0.95));
box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);
box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
}

// ---
// BUTTONS
// ---
.btn-branded {
background-color: #33ffff;
background-color: var(--primary-colour);
width: fit-content;
margin: auto;
}

.btn-branded:hover {
background-color: #3399FF;
background-color: var(--secondary-colour);
}

// ---
Expand Down Expand Up @@ -56,4 +57,13 @@
border-width: 2px;
border-radius: 10px;
margin: 8px;
}

// ---
// CARDS
// ---

.img-fit {
max-width: 95%;
object-fit: contain;
}
14 changes: 13 additions & 1 deletion config/_default/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,16 @@ languageCode: en-us
title: UK TRE Community
theme: hugo-bootstrap-theme
themesdir: node_modules/@filipecarneiro
copyright: Add our licence
copyright: Add our licence

# Build all pages that have a frontmatter date setting of the future - this allows us to publish pages for events happening in the future
buildFuture: true

# Taxonomies
taxonomies:
tag: tags
category: categories
tag_resource_type: tag_resource_types
tag_resource_topic: tag_resource_topics


2 changes: 1 addition & 1 deletion config/_default/menus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ main:
weight: 20

- name: Working Groups
url: workinggroups
url: groups
weight: 30

- name: Events
Expand Down
7 changes: 6 additions & 1 deletion config/_default/params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ description: We're signposting, sharing knowledge and facilitating conversations
images: [images/uktre-logo.svg, images/github.svg, images/slack.svg, images/community-photo.JPEG]
mainMenuLogo: images/uktre-logo.svg


# Options
options:
bootStrapJs: true
breadCrumb: true
listCategoryFilter: true
listTagFilter: true
7 changes: 7 additions & 0 deletions content/about/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: About us
layout: about/index
description: Use this page to explore different parts of the UK TRE Community in more detail!
url: /about
---

11 changes: 11 additions & 0 deletions content/about/focus/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
title: "Current focus"
description: "Details on our current focus, including successfully funded live grant funding proposals"
draft: false
url: about/focus
tags:
- about
---

# Current focus

10 changes: 10 additions & 0 deletions content/about/governance/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: "Governance"
description: "Our governing documents, decision making processes, template charters and more"
draft: false
url: about/governance
tags:
- about
---

# Governance
5 changes: 0 additions & 5 deletions content/about/index.md

This file was deleted.

10 changes: 10 additions & 0 deletions content/about/people/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: "People & Membership"
description: "Community members holding roles within the community, and official member organisations"
draft: false
url: about/people
tags:
- about
---

# People & Membership
10 changes: 10 additions & 0 deletions content/about/story/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: "Our story"
description: "More information on how we started, where we are now and where we're going"
draft: false
url: about/story
tags:
- about
---

# Our story
7 changes: 7 additions & 0 deletions content/events/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: Community events
layout: events/index
description: See what events we have coming up, and access notes, slides and recordings from previous events
url: /events
---

23 changes: 23 additions & 0 deletions content/events/past/december_meeting.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
title: "UK TRE Community December quarterly meeting"
description: "The quarterly meeting for the community, including community updates, breakout discussions and project workshops, hosted online"
date: "2023-12-05T13:30:00"
end_date: "2023-12-05T17:00:00"
location: "Online"
register_url: "https://example.com"
draft: false
url: events/december_23_community_meeting
tags:
- past_event
---

# UK TRE Community December quarterly meeting
**Date**: 5th December 2023 13:30 - 17:00

**Host**: UK TRE Community

**Registration details**: https://example.com

## Description

[ADD DESCRIPTION BELOW]
23 changes: 23 additions & 0 deletions content/events/upcoming/march_meeting.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
title: "UK TRE Community March quarterly meeting"
description: "The quarterly meeting for the community, including community updates, breakout discussions and project workshops, hosted online"
date: "2024-03-01T09:00:00"
end_date: "2024-03-01T10:00:00"
location: "Online"
register_url: "https://example.com"
draft: false
url: events/march_24_community_meeting
tags:
- upcoming_event
---

# UK TRE Community March quarterly meeting
**Date**: 1st March 2024 09:00 - 17:00

**Host**: UK TRE Community

**Registration details**: https://example.com

## Description

[ADD DESCRIPTION BELOW]
6 changes: 6 additions & 0 deletions content/getinvolved/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Get Involved
layout: getinvolved/index
description: Great to have you here! Please see the different ways you can get involved below
url: /getinvolved
---
7 changes: 7 additions & 0 deletions content/groups/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: Working groups
layout: groups/index
description: Our current and past working groups
url: /groups
---

14 changes: 14 additions & 0 deletions content/groups/current/sde_tre_terminology/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
title: "SDE/TRE Terminology Working Group"
description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
chairs:
- Pete Barnsley (Francis Crick Institute)
- Madalyn Hardaker (KCL)
draft: false
url: groups/sde_tre_terminology
layout: groups/group_page
tags:
- current_wg
---


12 changes: 12 additions & 0 deletions content/groups/current/sde_tre_terminology/charter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: "Charter"
---
<!-- # Charter -->

## Background

xxxx

## Targets

xxxx
16 changes: 16 additions & 0 deletions content/groups/current/sde_tre_terminology/events.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "Events and meetings"
---
<!-- # Events and meetings -->

## Meetings

Meetings take place on X at Y.

Fill out [this form]() to register interest to be invited to this working group's meetings.
The chairs will review your response and get in touch.

## Events

The groups upcoming events are listed below:

15 changes: 15 additions & 0 deletions content/groups/current/sde_tre_terminology/members.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: "Members"
---

<!-- # Members -->

## Chairs

- Pete Barnsley (Francis Crick Institute)
- Madalyn Hardaker (KCL)

## Other members

- Test
- Test
11 changes: 11 additions & 0 deletions content/groups/current/sde_tre_terminology/outputs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
title: "Final outputs"
---

<!-- # Final outputs -->

## [RESOURCE 1]

**Type:**

**Link:**
17 changes: 17 additions & 0 deletions content/groups/current/sde_tre_terminology/resources.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
title: "Resources"
---

<!-- # Resources -->

## [RESOURCE 1]

**Type:**

**Link:**

## [RESOURCE 1]

**Type:**

**Link:**
13 changes: 13 additions & 0 deletions content/groups/current/test_group/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
title: "Test"
description: "Test"
chairs:
- Hari Sood
draft: false
url: groups/test
layout: groups/group_page
tags:
- current_wg
---


8 changes: 8 additions & 0 deletions content/groups/current/test_group/charter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
title: "Charter"
---
<!-- # Charter -->

testestestestest

## asdsadsa
16 changes: 16 additions & 0 deletions content/groups/current/test_group/events.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "Events and meetings"
---
<!-- # Events and meetings -->

## Meetings

Meetings take place on X at Y.

Fill out [this form]() to register interest to be invited to this working group's meetings.
The chairs will review your response and get in touch.

## Events

The groups upcoming events are listed below:

15 changes: 15 additions & 0 deletions content/groups/current/test_group/members.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: "Members"
---

<!-- # Members -->

## Chairs

- Pete Barnsley (Francis Crick Institute)
- Madalyn Hardaker (KCL)

## Other members

- Test
- Test
Loading

0 comments on commit c9431a1

Please sign in to comment.