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.

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

Ajp/oct events #549

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions assets/scss/components/_team.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#team_flex_box {
display: flex;
flex-direction: row;
justify-content: space-evenly;
align-items: center;
flex-wrap: wrap;
Expand All @@ -14,6 +15,23 @@
width: 100%;
}

.team-row {
display: flex;
gap: 30px;
}

.team-row-4 {
flex-wrap: wrap;
}

.team-row-3 {
flex-wrap: wrap;
}

.team-row-2 {
flex-wrap: wrap;
}

.past {
a {
display: none;
Expand Down
16 changes: 16 additions & 0 deletions content/events/2024-2025/2024-10-28-2804-study-session.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
display_title: "COMP804 Midterm Review"
title: "COMP2804 Midterm Review"
date: 2024-10-28T00:00:00Z
draft: false
layout: event
poster: "images/event_posters/2024-2025/2804-study-session-f24.png"
poster_cover: "contain"
poster_position: "center"
short_description: "Prepare for your midterm with the help of mentors!"
start_time: "7:00 - 9:00 PM EST"
location: "HP 5345"
location_link: "https://carleton.ca/campus/buildings/herzberg-laboratories/"
background: "images/orientation2018-min.jpeg"
publishdate: 2024-10-27
---
16 changes: 16 additions & 0 deletions content/events/2024-2025/2024-10-31-halloween-movie-night.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
display_title: "Halloween Movie Night"
title: "Halloween Movie Night"
date: 2024-10-31T00:00:00Z
draft: false
layout: event
poster: "images/event_posters/2024-2025/halloween-movie-night.png"
poster_cover: "contain"
poster_position: "center"
short_description: "Celebrate Halloween with a spooky movie and free snacks!"
start_time: "6:00 - 9:00 PM EST"
location: "HP 5345"
location_link: "https://carleton.ca/campus/buildings/herzberg-laboratories/"
background: "images/orientation2018-min.jpeg"
publishdate: 2024-10-27
---
12 changes: 11 additions & 1 deletion data/current_team.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,14 @@
role: Director of Academics
email: [email protected]
intro: "Hey everyone! My name is Ben Yu and I'm currently a 3rd year student. I'll be your Director of Academics this year, and I can't wait for you guys to see what we have planned. I enjoy playing and listening to all sorts of music in my spare time. Feel free to reach out anytime!"
image: images/executives/benjamin_yu.jpg
image: images/executives/benjamin_yu.jpg
- name: Afaq Virk
role: First Year Representative
email: [email protected]
intro: "Hey all! I'm Afaq, a first year student in the Dev Degree Stream. Don't hesitate to set up a chat about... anything, really!"
image: images/executives/afaq.png
- name: Maliha Ali
role: First Year Representative
email: [email protected]
intro: "Hello! I'm Maliha, I'm a first year in the Dev Degree program and I'm so excited to work with you all! I love classical music and the fine arts and I'm up to chat whenever :)"
image: images/executives/maliha.jpg
8 changes: 8 additions & 0 deletions layouts/_default/team.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
{{ define "main" }}
{{- partial "navbar_temp.html" . -}}
<div id="team_flex_box">
{{ $counter := 0 }}
{{ range $.Site.Data.current_team }}
{{ if eq $counter 0 }}<div class="team-row team-row-4">{{ end }}
{{ if eq $counter 4 }}</div><div class="team-row team-row-3">{{ end }}
{{ if eq $counter 7 }}</div><div class="team-row team-row-2">{{ end }}

{{- partial "team_card.html" (dict "name" .name "role" .role "email" .email "intro" .intro "image" .image ) -}}

{{ $counter = add $counter 1 }}
{{ end }}
</div>
</div>
<div class="see-more">
<a href="/about/team/past/">See Previous Teams...</a>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/images/executives/afaq.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/images/executives/maliha.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading