From f36d61239627cb96f21f2d6e7a8e79ede2e75608 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Mon, 2 Jun 2025 00:40:48 -0400 Subject: [PATCH 01/30] delete old faq contribution guide --- .../contribution-guides/contributing-faqs.md | 66 ------------------- 1 file changed, 66 deletions(-) delete mode 100644 content/resources/contribution-guides/contributing-faqs.md diff --git a/content/resources/contribution-guides/contributing-faqs.md b/content/resources/contribution-guides/contributing-faqs.md deleted file mode 100644 index 4b4798396f..0000000000 --- a/content/resources/contribution-guides/contributing-faqs.md +++ /dev/null @@ -1,66 +0,0 @@ -# Contributing FAQs - -FAQs can be be viewed here - [ccss.carleton.ca/faq/course-registration/](https://ccss.carleton.ca/faq/course-registration/) - -FAQ Topic Page: - - -Sample FAQ: - - -
- -## 0.1 Setup the CCSS website project locally - -Follow the instructions in the **README** - -## 0.2 Look at the example for a written FAQ - -The markdown file for a completed FAQ can be found here: `content/resources/faq/questions/free-vs-breadth-electives.md` -Sample completed FAQ page - [What is a Breadth elective vs a Free elective](https://ccss.carleton.ca/resources/faq/questions/free-vs-breadth-electives/) - -## 1. Pick an unwritten FAQ from the project board - -[Resources Contributions Project Board](https://github.com/orgs/CarletonComputerScienceSociety/projects/22) - -Leave a comment under the FAQ ticket indicating that you're working on it. - -## 2. Locate the empty markdown file - -You can find the FAQ markdown files here: `content/resources/faq/questions` - -## 3. Complete the front matter attributes - -- `title` - The title of the FAQ that will show up on the webpage -- `date` - The date on which an FAQ was initially published. Format - `YYYY-MM-DDT00:00:00Z` -- `last_updated` - If an FAQ is updated, the date of the edit. Otherwise, same as the `date` attribute. Format - `YYYY-MM-DDT00:00:00Z` -- `draft` - Value should be set to "true" -- `layout` - Value should be set to "faq-question"" -- `summary` - Summary text that will show up on the topic page with the full list of FAQs (see first image) -- `contributors` - Names of the people that contributed to writing and editing the FAQ -- `sources`: Any links or sources that have been referenced in the answer. Format: -```diff - - name1: Title of the webpage - link1: Link - - name2: Title of the webpage - link2: Link - ... -``` - -## 4. Write the answer - -- FAQs are intended to summarise relevant information as concisely as possible. Try to stick to **100-200 words**. -- Don't rewrite things that have already been explained by the School of Computer Science or Carleton University webpages. You can include a short summary or quote and then link to their webpages. -- The ticket on the project board corresponding to your FAQ will highlight some information that should be covered by your answer. You can add any other information you think is useful but anything highlighted there must be included. -- The ticket on the project board corresponding to your FAQ will highlight some information that should be covered by your answer. - -## 5. Format your answer with markdown - -If you are not familiar with markdown, check out [Github's guide for markdown syntax](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax) - -You can refer to a completed FAQ file to get an idea of how to include links - -## 6. Make a Pull Request with the completed FAQ file - -If you are not familiar with using Git/Github, check out this guide - [Intro to Git and Github](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners) - From 745ab13aac1c2137ec2241ec450aebaef074ccc7 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Mon, 2 Jun 2025 00:45:34 -0400 Subject: [PATCH 02/30] update folder structure --- .../{faq => }/questions/1005-and-1006-vs-1405-and-1406.md | 0 content/resources/{faq => }/questions/add-a-minor.md | 0 .../{faq => }/questions/change-courses-after-registering.md | 0 content/resources/{faq => }/questions/comp1405-t-section.md | 0 content/resources/{faq => }/questions/comp1405-z-section.md | 0 .../{faq => }/questions/free-vs-breadth-electives.md | 0 .../{faq => }/questions/how-many-courses-per-semester.md | 0 content/resources/{faq => }/questions/override-request.md | 0 .../questions/programming-experience-before-first-year.md | 0 .../register-for-winter-courses-with-fall-courses.md | 0 .../{faq => }/questions/second-year-courses-in-first-year.md | 0 .../resources/{faq => }/questions/which-breadth-electives.md | 0 .../{faq => }/questions/which-courses-in-first-year.md | 0 .../questions/which-programming-languages-in-courses.md | 0 content/resources/{faq => }/questions/which-stream.md | 0 content/resources/{faq => }/topics/course-registration.md | 4 ++-- layouts/_default/{faq-topic.html => resource-topic.html} | 2 +- 17 files changed, 3 insertions(+), 3 deletions(-) rename content/resources/{faq => }/questions/1005-and-1006-vs-1405-and-1406.md (100%) rename content/resources/{faq => }/questions/add-a-minor.md (100%) rename content/resources/{faq => }/questions/change-courses-after-registering.md (100%) rename content/resources/{faq => }/questions/comp1405-t-section.md (100%) rename content/resources/{faq => }/questions/comp1405-z-section.md (100%) rename content/resources/{faq => }/questions/free-vs-breadth-electives.md (100%) rename content/resources/{faq => }/questions/how-many-courses-per-semester.md (100%) rename content/resources/{faq => }/questions/override-request.md (100%) rename content/resources/{faq => }/questions/programming-experience-before-first-year.md (100%) rename content/resources/{faq => }/questions/register-for-winter-courses-with-fall-courses.md (100%) rename content/resources/{faq => }/questions/second-year-courses-in-first-year.md (100%) rename content/resources/{faq => }/questions/which-breadth-electives.md (100%) rename content/resources/{faq => }/questions/which-courses-in-first-year.md (100%) rename content/resources/{faq => }/questions/which-programming-languages-in-courses.md (100%) rename content/resources/{faq => }/questions/which-stream.md (100%) rename content/resources/{faq => }/topics/course-registration.md (91%) rename layouts/_default/{faq-topic.html => resource-topic.html} (95%) diff --git a/content/resources/faq/questions/1005-and-1006-vs-1405-and-1406.md b/content/resources/questions/1005-and-1006-vs-1405-and-1406.md similarity index 100% rename from content/resources/faq/questions/1005-and-1006-vs-1405-and-1406.md rename to content/resources/questions/1005-and-1006-vs-1405-and-1406.md diff --git a/content/resources/faq/questions/add-a-minor.md b/content/resources/questions/add-a-minor.md similarity index 100% rename from content/resources/faq/questions/add-a-minor.md rename to content/resources/questions/add-a-minor.md diff --git a/content/resources/faq/questions/change-courses-after-registering.md b/content/resources/questions/change-courses-after-registering.md similarity index 100% rename from content/resources/faq/questions/change-courses-after-registering.md rename to content/resources/questions/change-courses-after-registering.md diff --git a/content/resources/faq/questions/comp1405-t-section.md b/content/resources/questions/comp1405-t-section.md similarity index 100% rename from content/resources/faq/questions/comp1405-t-section.md rename to content/resources/questions/comp1405-t-section.md diff --git a/content/resources/faq/questions/comp1405-z-section.md b/content/resources/questions/comp1405-z-section.md similarity index 100% rename from content/resources/faq/questions/comp1405-z-section.md rename to content/resources/questions/comp1405-z-section.md diff --git a/content/resources/faq/questions/free-vs-breadth-electives.md b/content/resources/questions/free-vs-breadth-electives.md similarity index 100% rename from content/resources/faq/questions/free-vs-breadth-electives.md rename to content/resources/questions/free-vs-breadth-electives.md diff --git a/content/resources/faq/questions/how-many-courses-per-semester.md b/content/resources/questions/how-many-courses-per-semester.md similarity index 100% rename from content/resources/faq/questions/how-many-courses-per-semester.md rename to content/resources/questions/how-many-courses-per-semester.md diff --git a/content/resources/faq/questions/override-request.md b/content/resources/questions/override-request.md similarity index 100% rename from content/resources/faq/questions/override-request.md rename to content/resources/questions/override-request.md diff --git a/content/resources/faq/questions/programming-experience-before-first-year.md b/content/resources/questions/programming-experience-before-first-year.md similarity index 100% rename from content/resources/faq/questions/programming-experience-before-first-year.md rename to content/resources/questions/programming-experience-before-first-year.md diff --git a/content/resources/faq/questions/register-for-winter-courses-with-fall-courses.md b/content/resources/questions/register-for-winter-courses-with-fall-courses.md similarity index 100% rename from content/resources/faq/questions/register-for-winter-courses-with-fall-courses.md rename to content/resources/questions/register-for-winter-courses-with-fall-courses.md diff --git a/content/resources/faq/questions/second-year-courses-in-first-year.md b/content/resources/questions/second-year-courses-in-first-year.md similarity index 100% rename from content/resources/faq/questions/second-year-courses-in-first-year.md rename to content/resources/questions/second-year-courses-in-first-year.md diff --git a/content/resources/faq/questions/which-breadth-electives.md b/content/resources/questions/which-breadth-electives.md similarity index 100% rename from content/resources/faq/questions/which-breadth-electives.md rename to content/resources/questions/which-breadth-electives.md diff --git a/content/resources/faq/questions/which-courses-in-first-year.md b/content/resources/questions/which-courses-in-first-year.md similarity index 100% rename from content/resources/faq/questions/which-courses-in-first-year.md rename to content/resources/questions/which-courses-in-first-year.md diff --git a/content/resources/faq/questions/which-programming-languages-in-courses.md b/content/resources/questions/which-programming-languages-in-courses.md similarity index 100% rename from content/resources/faq/questions/which-programming-languages-in-courses.md rename to content/resources/questions/which-programming-languages-in-courses.md diff --git a/content/resources/faq/questions/which-stream.md b/content/resources/questions/which-stream.md similarity index 100% rename from content/resources/faq/questions/which-stream.md rename to content/resources/questions/which-stream.md diff --git a/content/resources/faq/topics/course-registration.md b/content/resources/topics/course-registration.md similarity index 91% rename from content/resources/faq/topics/course-registration.md rename to content/resources/topics/course-registration.md index 8cb335ac76..5ae92a0b18 100644 --- a/content/resources/faq/topics/course-registration.md +++ b/content/resources/topics/course-registration.md @@ -3,8 +3,8 @@ title: "Course Registration" description: "Find the answers to all your questions about course registration." date: 2024-05-31T00:00:00Z draft: false -url: "/faq/course-registration" -layout: faq-topic +url: "/resources/course-registration" +layout: resource-topic header_image_url: images/general/game_lab.jpg questions: - free-vs-breadth-electives diff --git a/layouts/_default/faq-topic.html b/layouts/_default/resource-topic.html similarity index 95% rename from layouts/_default/faq-topic.html rename to layouts/_default/resource-topic.html index 50ffa6f5a8..d77a5c3e54 100644 --- a/layouts/_default/faq-topic.html +++ b/layouts/_default/resource-topic.html @@ -21,7 +21,7 @@
{{ range .Params.questions }} - {{ $page := printf "resources/faq/questions/%s" . }} + {{ $page := printf "resources/questions/%s" . }} {{ with $.Site.GetPage $page }}

{{ .Title }}

From 4320929bb7a58125f7246dbc963513b024fd5ef4 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Mon, 2 Jun 2025 00:58:12 -0400 Subject: [PATCH 03/30] add initial article support --- content/resources/articles/test-article.md | 11 +++++++++++ .../1005-and-1006-vs-1405-and-1406.md | 0 .../{questions => faqs}/add-a-minor.md | 0 .../change-courses-after-registering.md | 0 .../{questions => faqs}/comp1405-t-section.md | 0 .../{questions => faqs}/comp1405-z-section.md | 0 .../free-vs-breadth-electives.md | 0 .../how-many-courses-per-semester.md | 0 .../{questions => faqs}/override-request.md | 0 ...programming-experience-before-first-year.md | 0 ...ter-for-winter-courses-with-fall-courses.md | 0 .../second-year-courses-in-first-year.md | 0 .../which-breadth-electives.md | 0 .../which-courses-in-first-year.md | 0 .../which-programming-languages-in-courses.md | 0 .../{questions => faqs}/which-stream.md | 0 .../resources/topics/course-registration.md | 4 +++- layouts/_default/resource-topic.html | 18 +++++++++++++++--- 18 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 content/resources/articles/test-article.md rename content/resources/{questions => faqs}/1005-and-1006-vs-1405-and-1406.md (100%) rename content/resources/{questions => faqs}/add-a-minor.md (100%) rename content/resources/{questions => faqs}/change-courses-after-registering.md (100%) rename content/resources/{questions => faqs}/comp1405-t-section.md (100%) rename content/resources/{questions => faqs}/comp1405-z-section.md (100%) rename content/resources/{questions => faqs}/free-vs-breadth-electives.md (100%) rename content/resources/{questions => faqs}/how-many-courses-per-semester.md (100%) rename content/resources/{questions => faqs}/override-request.md (100%) rename content/resources/{questions => faqs}/programming-experience-before-first-year.md (100%) rename content/resources/{questions => faqs}/register-for-winter-courses-with-fall-courses.md (100%) rename content/resources/{questions => faqs}/second-year-courses-in-first-year.md (100%) rename content/resources/{questions => faqs}/which-breadth-electives.md (100%) rename content/resources/{questions => faqs}/which-courses-in-first-year.md (100%) rename content/resources/{questions => faqs}/which-programming-languages-in-courses.md (100%) rename content/resources/{questions => faqs}/which-stream.md (100%) diff --git a/content/resources/articles/test-article.md b/content/resources/articles/test-article.md new file mode 100644 index 0000000000..78df6e47ce --- /dev/null +++ b/content/resources/articles/test-article.md @@ -0,0 +1,11 @@ +--- +title: "Test article" +date: 2025-06-02T00:00:00Z +last_updated: 2025-06-02T00:00:00Z +draft: false +layout: faq-question +summary: "test summary" +contributors: +- "Jacc" +sources: +--- \ No newline at end of file diff --git a/content/resources/questions/1005-and-1006-vs-1405-and-1406.md b/content/resources/faqs/1005-and-1006-vs-1405-and-1406.md similarity index 100% rename from content/resources/questions/1005-and-1006-vs-1405-and-1406.md rename to content/resources/faqs/1005-and-1006-vs-1405-and-1406.md diff --git a/content/resources/questions/add-a-minor.md b/content/resources/faqs/add-a-minor.md similarity index 100% rename from content/resources/questions/add-a-minor.md rename to content/resources/faqs/add-a-minor.md diff --git a/content/resources/questions/change-courses-after-registering.md b/content/resources/faqs/change-courses-after-registering.md similarity index 100% rename from content/resources/questions/change-courses-after-registering.md rename to content/resources/faqs/change-courses-after-registering.md diff --git a/content/resources/questions/comp1405-t-section.md b/content/resources/faqs/comp1405-t-section.md similarity index 100% rename from content/resources/questions/comp1405-t-section.md rename to content/resources/faqs/comp1405-t-section.md diff --git a/content/resources/questions/comp1405-z-section.md b/content/resources/faqs/comp1405-z-section.md similarity index 100% rename from content/resources/questions/comp1405-z-section.md rename to content/resources/faqs/comp1405-z-section.md diff --git a/content/resources/questions/free-vs-breadth-electives.md b/content/resources/faqs/free-vs-breadth-electives.md similarity index 100% rename from content/resources/questions/free-vs-breadth-electives.md rename to content/resources/faqs/free-vs-breadth-electives.md diff --git a/content/resources/questions/how-many-courses-per-semester.md b/content/resources/faqs/how-many-courses-per-semester.md similarity index 100% rename from content/resources/questions/how-many-courses-per-semester.md rename to content/resources/faqs/how-many-courses-per-semester.md diff --git a/content/resources/questions/override-request.md b/content/resources/faqs/override-request.md similarity index 100% rename from content/resources/questions/override-request.md rename to content/resources/faqs/override-request.md diff --git a/content/resources/questions/programming-experience-before-first-year.md b/content/resources/faqs/programming-experience-before-first-year.md similarity index 100% rename from content/resources/questions/programming-experience-before-first-year.md rename to content/resources/faqs/programming-experience-before-first-year.md diff --git a/content/resources/questions/register-for-winter-courses-with-fall-courses.md b/content/resources/faqs/register-for-winter-courses-with-fall-courses.md similarity index 100% rename from content/resources/questions/register-for-winter-courses-with-fall-courses.md rename to content/resources/faqs/register-for-winter-courses-with-fall-courses.md diff --git a/content/resources/questions/second-year-courses-in-first-year.md b/content/resources/faqs/second-year-courses-in-first-year.md similarity index 100% rename from content/resources/questions/second-year-courses-in-first-year.md rename to content/resources/faqs/second-year-courses-in-first-year.md diff --git a/content/resources/questions/which-breadth-electives.md b/content/resources/faqs/which-breadth-electives.md similarity index 100% rename from content/resources/questions/which-breadth-electives.md rename to content/resources/faqs/which-breadth-electives.md diff --git a/content/resources/questions/which-courses-in-first-year.md b/content/resources/faqs/which-courses-in-first-year.md similarity index 100% rename from content/resources/questions/which-courses-in-first-year.md rename to content/resources/faqs/which-courses-in-first-year.md diff --git a/content/resources/questions/which-programming-languages-in-courses.md b/content/resources/faqs/which-programming-languages-in-courses.md similarity index 100% rename from content/resources/questions/which-programming-languages-in-courses.md rename to content/resources/faqs/which-programming-languages-in-courses.md diff --git a/content/resources/questions/which-stream.md b/content/resources/faqs/which-stream.md similarity index 100% rename from content/resources/questions/which-stream.md rename to content/resources/faqs/which-stream.md diff --git a/content/resources/topics/course-registration.md b/content/resources/topics/course-registration.md index 5ae92a0b18..d036bee6be 100644 --- a/content/resources/topics/course-registration.md +++ b/content/resources/topics/course-registration.md @@ -6,7 +6,9 @@ draft: false url: "/resources/course-registration" layout: resource-topic header_image_url: images/general/game_lab.jpg -questions: +articles: +- test-article +faqs: - free-vs-breadth-electives - comp1405-z-section - comp1405-t-section diff --git a/layouts/_default/resource-topic.html b/layouts/_default/resource-topic.html index d77a5c3e54..d94442872e 100644 --- a/layouts/_default/resource-topic.html +++ b/layouts/_default/resource-topic.html @@ -15,13 +15,25 @@
+
+ {{ range .Params.articles }} + {{ $page := printf "resources/articles/%s" . }} + {{ with $.Site.GetPage $page }} +
+

{{ .Title }}

+

{{ .Params.summary }}

+ {{- partial "read-more.html" (dict "label" "Read More " "link" .RelPermalink) -}} +
+ {{ end }} + {{ end }} +
- {{ range .Params.questions }} - {{ $page := printf "resources/questions/%s" . }} + {{ range .Params.faqs }} + {{ $page := printf "resources/faqs/%s" . }} {{ with $.Site.GetPage $page }}

{{ .Title }}

From 2c3e2377560d020dc8da0502e75778b9831587a3 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Tue, 3 Jun 2025 17:58:49 -0400 Subject: [PATCH 04/30] add article cards --- assets/scss/components/_faq-topic.scss | 52 +++++++++++++++++++ .../articles/first-year-course-selection.md | 11 ++++ .../articles/making-your-perfect-schedule.md | 11 ++++ content/resources/articles/test-article.md | 11 ---- .../resources/topics/course-registration.md | 5 +- layouts/_default/resource-topic.html | 16 ++++-- 6 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 content/resources/articles/first-year-course-selection.md create mode 100644 content/resources/articles/making-your-perfect-schedule.md delete mode 100644 content/resources/articles/test-article.md diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index aaa152a1c6..96fb45cbe6 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -23,6 +23,51 @@ } } + &__articles { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 2.5rem; + align-items: stretch; + } + + &__article { + background-color: #fff; + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05); + border-radius: 0.5rem; + padding: 2rem; + display: flex; + flex-direction: column; + justify-content: space-between; + transition: all 0.2s ease-in-out; + + .card_text { + flex-grow: 1; + } + + h3 { + min-height: 3rem; + font-weight: 700; + font-size: 1.25rem; + margin: 0 0 1.5rem 0; + } + + p { + color: #5f5f5f; + margin-bottom: 1.5rem; + font-size: 1rem; + } + + a { + margin-top: 1.5rem; + align-self: flex-start; + } + + &:hover { + box-shadow: 0 6px 20px rgba(0, 0, 0, 0.1); + transform: translateY(-4px); + } + } + &__questions { display: grid; grid-template-columns: 1fr 1fr; @@ -30,6 +75,7 @@ } &__question { + p { color: #8d8d8d; margin-bottom: 1.5rem; @@ -49,6 +95,12 @@ } @media (max-width: 768px) { + + &__articles { + grid-template-columns: 1fr; + gap: 2.5rem; + } + &__questions { grid-template-columns: 1fr; gap: 2.5rem; diff --git a/content/resources/articles/first-year-course-selection.md b/content/resources/articles/first-year-course-selection.md new file mode 100644 index 0000000000..7c2856195e --- /dev/null +++ b/content/resources/articles/first-year-course-selection.md @@ -0,0 +1,11 @@ +--- +title: "First-Year Course Selection Guide: Student Edition" +date: 2025-06-02T00:00:00Z +last_updated: 2025-06-02T00:00:00Z +draft: false +layout: faq-question +summary: "An overview of recommended first-year COMP, MATH, and elective courses, along with common scheduling options to help you plan your timetable effectively." +contributors: +- "Jacc" +sources: +--- \ No newline at end of file diff --git a/content/resources/articles/making-your-perfect-schedule.md b/content/resources/articles/making-your-perfect-schedule.md new file mode 100644 index 0000000000..32351b327d --- /dev/null +++ b/content/resources/articles/making-your-perfect-schedule.md @@ -0,0 +1,11 @@ +--- +title: "Making the Perfect Schedule" +date: 2025-06-02T00:00:00Z +last_updated: 2025-06-02T00:00:00Z +draft: false +layout: faq-question +summary: "A collection of tips and tricks to help you build your ideal first-year schedule and navigate course planning with confidence." +contributors: +- "Jacc" +sources: +--- \ No newline at end of file diff --git a/content/resources/articles/test-article.md b/content/resources/articles/test-article.md deleted file mode 100644 index 78df6e47ce..0000000000 --- a/content/resources/articles/test-article.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: "Test article" -date: 2025-06-02T00:00:00Z -last_updated: 2025-06-02T00:00:00Z -draft: false -layout: faq-question -summary: "test summary" -contributors: -- "Jacc" -sources: ---- \ No newline at end of file diff --git a/content/resources/topics/course-registration.md b/content/resources/topics/course-registration.md index d036bee6be..bc1df81634 100644 --- a/content/resources/topics/course-registration.md +++ b/content/resources/topics/course-registration.md @@ -7,7 +7,10 @@ url: "/resources/course-registration" layout: resource-topic header_image_url: images/general/game_lab.jpg articles: -- test-article +- first-year-course-selection +- making-your-perfect-schedule +- making-your-perfect-schedule +- first-year-course-selection faqs: - free-vs-breadth-electives - comp1405-z-section diff --git a/layouts/_default/resource-topic.html b/layouts/_default/resource-topic.html index d94442872e..991e55e0f7 100644 --- a/layouts/_default/resource-topic.html +++ b/layouts/_default/resource-topic.html @@ -9,7 +9,7 @@
{{ .Description }}
- {{- partial "button.html" (dict "label" "View All FAQ") -}}
@@ -19,18 +19,24 @@ >
-
+

Resources

+
{{ range .Params.articles }} {{ $page := printf "resources/articles/%s" . }} {{ with $.Site.GetPage $page }}
-

{{ .Title }}

-

{{ .Params.summary }}

- {{- partial "read-more.html" (dict "label" "Read More " "link" .RelPermalink) -}} +
+

{{ .Title }}

+

{{ .Params.summary }}

+
+ + {{- partial "button.html" (dict "label" "Read More") -}} +
{{ end }} {{ end }}
+

FAQs

{{ range .Params.faqs }} {{ $page := printf "resources/faqs/%s" . }} From 0a6c8a69ccca69afb87a0e7381ac6d0e791d17f3 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Wed, 4 Jun 2025 00:45:29 -0400 Subject: [PATCH 05/30] update faq card design --- assets/scss/components/_faq-topic.scss | 101 +++++++++++++++++++------ layouts/_default/resource-topic.html | 22 +++--- 2 files changed, 91 insertions(+), 32 deletions(-) diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index 96fb45cbe6..a8dc9bd100 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -1,3 +1,12 @@ +#resources-heading { + margin-bottom: 2rem; +} + +#faqs-heading { + margin: 3rem 0 2rem 0; + scroll-margin-top: 7rem; +} + .faq-topic { &__page { background: #faf9f8; @@ -33,11 +42,11 @@ &__article { background-color: #fff; box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05); - border-radius: 0.5rem; - padding: 2rem; + border-radius: 0.5rem; + padding: 2rem; display: flex; flex-direction: column; - justify-content: space-between; + justify-content: space-between; transition: all 0.2s ease-in-out; .card_text { @@ -48,14 +57,15 @@ min-height: 3rem; font-weight: 700; font-size: 1.25rem; - margin: 0 0 1.5rem 0; + margin: 0 0 1.5rem 0; } p { color: #5f5f5f; margin-bottom: 1.5rem; + font-weight: 500; font-size: 1rem; - } + } a { margin-top: 1.5rem; @@ -69,41 +79,88 @@ } &__questions { - display: grid; - grid-template-columns: 1fr 1fr; - gap: 2.5rem; + a { + text-decoration: none; + + h3 { + color: #000; + font-weight: 700; + } + + p { + margin-top: 0.75rem; + } + } } &__question { - - p { - color: #8d8d8d; - margin-bottom: 1.5rem; - } + background-color: #fff; + max-height: 12rem; + border-radius: 1rem; + padding: 1rem 2rem; + margin-bottom: 1.5rem; + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.05); + transition: all 0.3s ease; + display: flex; + justify-content: space-between; + align-items: center; - a { + .faq-arrow { color: #c40729; + margin-left: 0.75rem; } - a:hover { - color: #ff1f48; + h3 { + font-weight: 700; + font-size: 1.25rem; + margin: 0; } - a:visited { - color: #c40729; + p { + color: #5f5f5f; + margin: 0; + font-weight: 500; + font-size: 1rem; + transition: all 0.3s ease; + } + + &:hover { + box-shadow: 0 12px 24px rgba(0, 0, 0, 0.1); + transform: translateY(-4px); } } @media (max-width: 768px) { - &__articles { grid-template-columns: 1fr; gap: 2.5rem; + + h3 { + font-size: 1.25rem; + line-height: 1.35; + } + + p { + font-size: 1rem; + line-height: 1.4; + } } - &__questions { - grid-template-columns: 1fr; - gap: 2.5rem; + &__question { + h3 { + font-size: 1rem; + line-height: 1.35; + } + + p { + font-size: 0.875rem; + line-height: 1.4; + display: -webkit-box; + -webkit-line-clamp: 2; // number of lines before ellipsis + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } } } } diff --git a/layouts/_default/resource-topic.html b/layouts/_default/resource-topic.html index 991e55e0f7..e6701c480e 100644 --- a/layouts/_default/resource-topic.html +++ b/layouts/_default/resource-topic.html @@ -10,7 +10,7 @@ {{ .Description }}
{{- partial "button.html" (dict "label" "View All FAQ") -}}{{- partial "button.html" (dict "label" "FAQ") -}}

Resources

-
+
{{ range .Params.articles }} {{ $page := printf "resources/articles/%s" . }} {{ with $.Site.GetPage $page }}
- {{ end }} {{ end }}
-

FAQs

+

Frequently Asked Questions

{{ range .Params.faqs }} {{ $page := printf "resources/faqs/%s" . }} {{ with $.Site.GetPage $page }} -
-

{{ .Title }}

-

{{ .Params.summary }}

- {{- partial "read-more.html" (dict "label" "Read More " "link" .RelPermalink) -}} -
+ +
+

{{ .Title }}

+

{{ .Params.summary }}

+
+ +
{{ end }} {{ end }}
From 7fd300ea5c76f49e27126144bdce3be8a293885c Mon Sep 17 00:00:00 2001 From: AJaccP Date: Wed, 4 Jun 2025 18:01:21 -0400 Subject: [PATCH 06/30] fix line clamp style rule --- assets/scss/components/_faq-topic.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index a8dc9bd100..a704955257 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -157,6 +157,7 @@ line-height: 1.4; display: -webkit-box; -webkit-line-clamp: 2; // number of lines before ellipsis + line-clamp: 2; // standard property for compatibility -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; From f1aeb74d6dc5010632005d660d2ead5505c325e6 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Wed, 4 Jun 2025 20:43:27 -0400 Subject: [PATCH 07/30] remove old empty faq markdowns --- .../resources/faqs/1005-and-1006-vs-1405-and-1406.md | 10 ---------- content/resources/faqs/add-a-minor.md | 10 ---------- .../resources/faqs/change-courses-after-registering.md | 10 ---------- content/resources/faqs/comp1405-t-section.md | 10 ---------- .../resources/faqs/how-many-courses-per-semester.md | 10 ---------- content/resources/faqs/override-request.md | 10 ---------- .../faqs/programming-experience-before-first-year.md | 10 ---------- .../register-for-winter-courses-with-fall-courses.md | 10 ---------- .../faqs/second-year-courses-in-first-year.md | 10 ---------- content/resources/faqs/which-breadth-electives.md | 10 ---------- content/resources/faqs/which-courses-in-first-year.md | 10 ---------- .../faqs/which-programming-languages-in-courses.md | 10 ---------- content/resources/faqs/which-stream.md | 10 ---------- 13 files changed, 130 deletions(-) delete mode 100644 content/resources/faqs/1005-and-1006-vs-1405-and-1406.md delete mode 100644 content/resources/faqs/add-a-minor.md delete mode 100644 content/resources/faqs/change-courses-after-registering.md delete mode 100644 content/resources/faqs/comp1405-t-section.md delete mode 100644 content/resources/faqs/how-many-courses-per-semester.md delete mode 100644 content/resources/faqs/override-request.md delete mode 100644 content/resources/faqs/programming-experience-before-first-year.md delete mode 100644 content/resources/faqs/register-for-winter-courses-with-fall-courses.md delete mode 100644 content/resources/faqs/second-year-courses-in-first-year.md delete mode 100644 content/resources/faqs/which-breadth-electives.md delete mode 100644 content/resources/faqs/which-courses-in-first-year.md delete mode 100644 content/resources/faqs/which-programming-languages-in-courses.md delete mode 100644 content/resources/faqs/which-stream.md diff --git a/content/resources/faqs/1005-and-1006-vs-1405-and-1406.md b/content/resources/faqs/1005-and-1006-vs-1405-and-1406.md deleted file mode 100644 index 86f007456a..0000000000 --- a/content/resources/faqs/1005-and-1006-vs-1405-and-1406.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "What is the difference between COMP 1005/1006 and COMP 1405/1406?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/add-a-minor.md b/content/resources/faqs/add-a-minor.md deleted file mode 100644 index 03a8607987..0000000000 --- a/content/resources/faqs/add-a-minor.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Should I add a minor to my degree?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/change-courses-after-registering.md b/content/resources/faqs/change-courses-after-registering.md deleted file mode 100644 index a4b79ca2e6..0000000000 --- a/content/resources/faqs/change-courses-after-registering.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Can I change my courses after registering?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/comp1405-t-section.md b/content/resources/faqs/comp1405-t-section.md deleted file mode 100644 index 9f6a3cad5f..0000000000 --- a/content/resources/faqs/comp1405-t-section.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "What is the COMP 1405 T Section?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/how-many-courses-per-semester.md b/content/resources/faqs/how-many-courses-per-semester.md deleted file mode 100644 index bf6b88dba0..0000000000 --- a/content/resources/faqs/how-many-courses-per-semester.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "How many courses should I take in a semester?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/override-request.md b/content/resources/faqs/override-request.md deleted file mode 100644 index bfe4b36cf4..0000000000 --- a/content/resources/faqs/override-request.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "What is an override request?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/programming-experience-before-first-year.md b/content/resources/faqs/programming-experience-before-first-year.md deleted file mode 100644 index b5e3fe5c85..0000000000 --- a/content/resources/faqs/programming-experience-before-first-year.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Do I need programming experience before starting my first year?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/register-for-winter-courses-with-fall-courses.md b/content/resources/faqs/register-for-winter-courses-with-fall-courses.md deleted file mode 100644 index 016d8d9f63..0000000000 --- a/content/resources/faqs/register-for-winter-courses-with-fall-courses.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Should I register for winter courses with my fall courses?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/second-year-courses-in-first-year.md b/content/resources/faqs/second-year-courses-in-first-year.md deleted file mode 100644 index 62d3c44e43..0000000000 --- a/content/resources/faqs/second-year-courses-in-first-year.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Can I take second year courses in my first year?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/which-breadth-electives.md b/content/resources/faqs/which-breadth-electives.md deleted file mode 100644 index d04fefc590..0000000000 --- a/content/resources/faqs/which-breadth-electives.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "What breadth electives should I take?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/which-courses-in-first-year.md b/content/resources/faqs/which-courses-in-first-year.md deleted file mode 100644 index f5852470f9..0000000000 --- a/content/resources/faqs/which-courses-in-first-year.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Which courses should I take in my first year?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/which-programming-languages-in-courses.md b/content/resources/faqs/which-programming-languages-in-courses.md deleted file mode 100644 index 0fd0fb3063..0000000000 --- a/content/resources/faqs/which-programming-languages-in-courses.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Which programming languages are used in Computer Science courses?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file diff --git a/content/resources/faqs/which-stream.md b/content/resources/faqs/which-stream.md deleted file mode 100644 index f420769e6a..0000000000 --- a/content/resources/faqs/which-stream.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Which stream should I choose?" -date: 2024-10-06T00:00:00Z -last_updated: 2024-10-06T00:00:00Z -draft: true -layout: faq-question -summary: "" -contributors: -sources: ---- \ No newline at end of file From 2d4eabf0203c29c1df1386752516d8c51f88769e Mon Sep 17 00:00:00 2001 From: AJaccP Date: Wed, 4 Jun 2025 20:54:14 -0400 Subject: [PATCH 08/30] update free vs breadth electives faq sources link --- content/resources/faqs/free-vs-breadth-electives.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/resources/faqs/free-vs-breadth-electives.md b/content/resources/faqs/free-vs-breadth-electives.md index 3ebef6c0d1..a82e4a2737 100644 --- a/content/resources/faqs/free-vs-breadth-electives.md +++ b/content/resources/faqs/free-vs-breadth-electives.md @@ -9,7 +9,7 @@ contributors: - Matthew MacRae-Bovell sources: - name: School of Computer Science - Electives and Prohibited Courses - link: https://carleton.ca/scs/current-students/undergraduate-students/help-selecting-courses/electives-and-prohibited-courses-2/ + link: https://carleton.ca/scs/current-students/undergraduate-students/help-selecting-courses/electives-and-prohibited-courses/ --- Breadth Electives **cannot** be under **COMP, MATH, or STAT**. After you fulfill your breadth elective requirement, courses that would have counted towards your breadth requirement begin to count as free electives. From 23b006b76c912ea8d15a4aea621816a1e85a42f7 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Wed, 4 Jun 2025 21:03:25 -0400 Subject: [PATCH 09/30] linting fix --- assets/scss/components/_faq-topic.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index a704955257..1671c8ec19 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -4,7 +4,7 @@ #faqs-heading { margin: 3rem 0 2rem 0; - scroll-margin-top: 7rem; + scroll-margin-top: 7rem; } .faq-topic { From dfac8c8e2f4212e13611d47ba78fed2b5bae6560 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Thu, 5 Jun 2025 11:19:34 -0400 Subject: [PATCH 10/30] refactor article and faq cards to partials --- layouts/_default/resource-topic.html | 18 ++---------------- layouts/partials/article-card.html | 9 +++++++++ layouts/partials/faq-card.html | 7 +++++++ 3 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 layouts/partials/article-card.html create mode 100644 layouts/partials/faq-card.html diff --git a/layouts/_default/resource-topic.html b/layouts/_default/resource-topic.html index e6701c480e..98141240c1 100644 --- a/layouts/_default/resource-topic.html +++ b/layouts/_default/resource-topic.html @@ -24,15 +24,7 @@

Resources

{{ range .Params.articles }} {{ $page := printf "resources/articles/%s" . }} {{ with $.Site.GetPage $page }} -
-
-

{{ .Title }}

-

{{ .Params.summary }}

-
- - {{- partial "button.html" (dict "label" "Read More") -}} - -
+ {{ partial "article-card.html" . }} {{ end }} {{ end }}
@@ -41,13 +33,7 @@

Frequently Asked Questions

{{ range .Params.faqs }} {{ $page := printf "resources/faqs/%s" . }} {{ with $.Site.GetPage $page }} - -
-

{{ .Title }}

-

{{ .Params.summary }}

-
- -
+ {{ partial "faq-card.html" . }} {{ end }} {{ end }}
diff --git a/layouts/partials/article-card.html b/layouts/partials/article-card.html new file mode 100644 index 0000000000..f96b3bc6d7 --- /dev/null +++ b/layouts/partials/article-card.html @@ -0,0 +1,9 @@ +
+
+

{{ .Title }}

+

{{ .Params.summary }}

+
+ + {{- partial "button.html" (dict "label" "Read More") -}} + +
\ No newline at end of file diff --git a/layouts/partials/faq-card.html b/layouts/partials/faq-card.html new file mode 100644 index 0000000000..e3234ed966 --- /dev/null +++ b/layouts/partials/faq-card.html @@ -0,0 +1,7 @@ + +
+

{{ .Title }}

+

{{ .Params.summary }}

+
+ +
\ No newline at end of file From 131ead69207125b76eb1d88d1bf2be0d51ffe7e8 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Thu, 5 Jun 2025 11:20:46 -0400 Subject: [PATCH 11/30] linting fix --- layouts/partials/article-card.html | 2 +- layouts/partials/faq-card.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/article-card.html b/layouts/partials/article-card.html index f96b3bc6d7..187d4c408c 100644 --- a/layouts/partials/article-card.html +++ b/layouts/partials/article-card.html @@ -6,4 +6,4 @@

{{ .Title }}

{{- partial "button.html" (dict "label" "Read More") -}} - \ No newline at end of file + diff --git a/layouts/partials/faq-card.html b/layouts/partials/faq-card.html index e3234ed966..ccd8212dc9 100644 --- a/layouts/partials/faq-card.html +++ b/layouts/partials/faq-card.html @@ -4,4 +4,4 @@

{{ .Title }}

{{ .Params.summary }}

- \ No newline at end of file + From bc161558209a323762b521f547822dd90915531a Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 14:18:45 -0400 Subject: [PATCH 12/30] update style classes to use resources-topic instead of faq-topic --- assets/scss/components/_faq-topic.scss | 2 +- layouts/_default/resource-topic.html | 10 +++++----- layouts/partials/article-card.html | 2 +- layouts/partials/faq-card.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index 1671c8ec19..db22aa9f90 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -7,7 +7,7 @@ scroll-margin-top: 7rem; } -.faq-topic { +.resources-topic { &__page { background: #faf9f8; height: fit-content; diff --git a/layouts/_default/resource-topic.html b/layouts/_default/resource-topic.html index 98141240c1..859bd50915 100644 --- a/layouts/_default/resource-topic.html +++ b/layouts/_default/resource-topic.html @@ -1,8 +1,8 @@ {{ define "main" }} {{- partial "navbar_temp.html" . -}} -
-
-
+
+
+
{{ .Title }}
@@ -20,7 +20,7 @@

Resources

-
+
{{ range .Params.articles }} {{ $page := printf "resources/articles/%s" . }} {{ with $.Site.GetPage $page }} @@ -29,7 +29,7 @@

Resources

{{ end }}

Frequently Asked Questions

-
+
{{ range .Params.faqs }} {{ $page := printf "resources/faqs/%s" . }} {{ with $.Site.GetPage $page }} diff --git a/layouts/partials/article-card.html b/layouts/partials/article-card.html index 187d4c408c..1b7bed9dd1 100644 --- a/layouts/partials/article-card.html +++ b/layouts/partials/article-card.html @@ -1,4 +1,4 @@ -
+

{{ .Title }}

{{ .Params.summary }}

diff --git a/layouts/partials/faq-card.html b/layouts/partials/faq-card.html index ccd8212dc9..51b22f035e 100644 --- a/layouts/partials/faq-card.html +++ b/layouts/partials/faq-card.html @@ -1,4 +1,4 @@ - +

{{ .Title }}

{{ .Params.summary }}

From 8a1378a3851da053612e79a21a172c343236c947 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 14:51:18 -0400 Subject: [PATCH 13/30] add related content partial --- assets/scss/components/_faq-question.scss | 4 ++++ assets/scss/components/_faq-topic.scss | 8 +++++++- content/resources/faqs/comp1405-z-section.md | 4 ++++ layouts/_default/faq-question.html | 5 ++++- layouts/partials/resources-related-content.html | 14 ++++++++++++++ 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 layouts/partials/resources-related-content.html diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index 16b104bcc8..57b1d36db4 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -44,4 +44,8 @@ color: #c40729; } } + + &__contributors { + margin-bottom: 2.5rem; + } } diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index db22aa9f90..640be579bd 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -121,7 +121,13 @@ margin: 0; font-weight: 500; font-size: 1rem; - transition: all 0.3s ease; + transition: all 0.3s ease; + display: -webkit-box; + -webkit-line-clamp: 1; // number of lines before ellipsis + line-clamp: 1; // standard property for compatibility + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } &:hover { diff --git a/content/resources/faqs/comp1405-z-section.md b/content/resources/faqs/comp1405-z-section.md index 17df67bf04..65ae97d9cd 100644 --- a/content/resources/faqs/comp1405-z-section.md +++ b/content/resources/faqs/comp1405-z-section.md @@ -12,6 +12,10 @@ sources: link: https://devdegree.ca/ - name: Override Requests link: https://carleton.ca/registrar/registration/override-requests/ +related: +- first-year-course-selection +- free-vs-breadth-electives +- comp1405-z-section --- The Z section is an **accelerated version of COMP 1405 and COMP 1406**, which allows you to complete both of them in the fall semester. COMP 1405 Z runs during the first half of the semester and COMP 1406 Z runs during the second half of the semester. It is important to note that the Z section is **not a separate course**, it is just a different section of both COMP 1405 and COMP 1406. diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index 75f92c80ea..caaec4c1cd 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -20,12 +20,15 @@

Links and Sources:

{{ end }} {{ end }}
-
+

Contributors:

{{ range .Params.contributors }}

{{ . }}

{{ end }}
+
{{ end }} diff --git a/layouts/partials/resources-related-content.html b/layouts/partials/resources-related-content.html new file mode 100644 index 0000000000..6cab80280f --- /dev/null +++ b/layouts/partials/resources-related-content.html @@ -0,0 +1,14 @@ +

Related Content:

+
+ {{ range .Params.related }} + {{ $page := printf "resources/articles/%s" . }} + {{ with $.Site.GetPage $page }} + {{ partial "faq-card.html" . }} + {{ end }} + + {{ $page := printf "resources/faqs/%s" . }} + {{ with $.Site.GetPage $page }} + {{ partial "faq-card.html" . }} + {{ end }} + {{ end }} +
\ No newline at end of file From 6e3499fe354aae73b70fc0a739ff01c86cd4eddd Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 14:59:20 -0400 Subject: [PATCH 14/30] remove test content --- content/resources/faqs/comp1405-z-section.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/content/resources/faqs/comp1405-z-section.md b/content/resources/faqs/comp1405-z-section.md index 65ae97d9cd..485660615a 100644 --- a/content/resources/faqs/comp1405-z-section.md +++ b/content/resources/faqs/comp1405-z-section.md @@ -14,8 +14,6 @@ sources: link: https://carleton.ca/registrar/registration/override-requests/ related: - first-year-course-selection -- free-vs-breadth-electives -- comp1405-z-section --- The Z section is an **accelerated version of COMP 1405 and COMP 1406**, which allows you to complete both of them in the fall semester. COMP 1405 Z runs during the first half of the semester and COMP 1406 Z runs during the second half of the semester. It is important to note that the Z section is **not a separate course**, it is just a different section of both COMP 1405 and COMP 1406. From d23e5e2eed9d2c1cca24bbc4bd99cbf6306f5aeb Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 14:59:44 -0400 Subject: [PATCH 15/30] linting fix --- assets/scss/components/_faq-question.scss | 2 +- assets/scss/components/_faq-topic.scss | 4 ++-- layouts/_default/faq-question.html | 4 ++-- layouts/partials/resources-related-content.html | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index 57b1d36db4..0e439ee782 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -47,5 +47,5 @@ &__contributors { margin-bottom: 2.5rem; - } + } } diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index 640be579bd..a40eb11635 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -121,13 +121,13 @@ margin: 0; font-weight: 500; font-size: 1rem; - transition: all 0.3s ease; + transition: all 0.3s ease; display: -webkit-box; -webkit-line-clamp: 1; // number of lines before ellipsis line-clamp: 1; // standard property for compatibility -webkit-box-orient: vertical; overflow: hidden; - text-overflow: ellipsis; + text-overflow: ellipsis; } &:hover { diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index caaec4c1cd..18f2c1d9ed 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -26,9 +26,9 @@

Contributors:

{{ . }}

{{ end }}
-
{{ end }} diff --git a/layouts/partials/resources-related-content.html b/layouts/partials/resources-related-content.html index 6cab80280f..8035089313 100644 --- a/layouts/partials/resources-related-content.html +++ b/layouts/partials/resources-related-content.html @@ -1,14 +1,14 @@ -

Related Content:

+

Related Content:

{{ range .Params.related }} {{ $page := printf "resources/articles/%s" . }} {{ with $.Site.GetPage $page }} - {{ partial "faq-card.html" . }} + {{ partial "faq-card.html" . }} {{ end }} {{ $page := printf "resources/faqs/%s" . }} {{ with $.Site.GetPage $page }} {{ partial "faq-card.html" . }} - {{ end }} + {{ end }} {{ end }} -
\ No newline at end of file +
From 7cb6a65440762dc9ec568d31f35c1a974107002b Mon Sep 17 00:00:00 2001 From: Riley Lutz Date: Sat, 7 Jun 2025 20:35:57 -0400 Subject: [PATCH 16/30] merged "resource-article-page" into "ajp/resource-page-updates" --- assets/scss/_components.scss | 1 + assets/scss/components/_article-question.scss | 92 +++++++++++++++++++ content/resources/articles/test-article.md | 18 ++++ layouts/_default/article-question.html | 35 +++++++ 4 files changed, 146 insertions(+) create mode 100644 assets/scss/components/_article-question.scss create mode 100644 content/resources/articles/test-article.md create mode 100644 layouts/_default/article-question.html diff --git a/assets/scss/_components.scss b/assets/scss/_components.scss index b9a44df655..d84463d073 100644 --- a/assets/scss/_components.scss +++ b/assets/scss/_components.scss @@ -33,3 +33,4 @@ @import "components/platforms"; @import "components/woa"; @import "components/volunteer"; +@import "components/article-question"; diff --git a/assets/scss/components/_article-question.scss b/assets/scss/components/_article-question.scss new file mode 100644 index 0000000000..0c64ae8af0 --- /dev/null +++ b/assets/scss/components/_article-question.scss @@ -0,0 +1,92 @@ +.article-question { + &__page { + background: #faf9f8; + min-height: 90vh; + height: fit-content; + padding-bottom: 5rem; + } + + &__content { + max-width: 65rem; + margin: 0 auto; + height: fit-content; + padding: 2.5rem; + } + + &__title { + font-size: 2.7rem; + font-weight: 700; + margin-bottom: 1.5rem; + } + + &__questions { + a { + text-decoration: none; + + h3 { + color: #000; + font-weight: 700; + } + + p { + margin-top: 0.75rem; + } + } + } + + &__summary { + font-size: 1.5rem; + margin-top: 1rem; + margin-bottom: 1rem; + } + + &__last-updated { + color: red; + margin-bottom: 2rem; + } + + &__body { + font-size: 1.15rem; + margin-bottom: 4rem; + } + + &__related-content { + } + + &__articles { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 2.5rem; + align-items: stretch; + } + + &__questions { + a { + text-decoration: none; + + h3 { + color: #000; + font-weight: 700; + } + + p { + margin-top: 0.75rem; + } + } + } + + &__sources { + margin-bottom: 2.5rem; + a { + color: #c40729; + } + + a:hover { + color: #ff1f48; + } + + a:visited { + color: #c40729; + } + } +} diff --git a/content/resources/articles/test-article.md b/content/resources/articles/test-article.md new file mode 100644 index 0000000000..0def9b8006 --- /dev/null +++ b/content/resources/articles/test-article.md @@ -0,0 +1,18 @@ +--- +title: "Test Article" +date: 2025-05-26T00:00:00Z +last_updated: 2025-05-26T00:00:00Z +draft: false +layout: article-question +summary: "Test Summary" +written_by: Test Writer +sources: + - name: Test Name + link: https://ccss.carleton.ca/ +related: +- first-year-course-selection +- making-your-perfect-schedule +--- + +--- +Body \ No newline at end of file diff --git a/layouts/_default/article-question.html b/layouts/_default/article-question.html new file mode 100644 index 0000000000..8e24320bb2 --- /dev/null +++ b/layouts/_default/article-question.html @@ -0,0 +1,35 @@ +{{ define "main" }} + {{- partial "navbar_temp.html" . -}} +
+
+

{{ .Title }}

+
+

Written by: {{ .Params.written_by }}

+
+
+ {{ .Params.summary }} +
+
+ Last Updated: + {{ .Params.last_updated | time | dateFormat "January 2, 2006" }} +
+
+ {{ .Content }} +
+
+ {{ with .Params.sources }} +

Links and Sources:

+ {{ range $index, $source := . }} +

+ ({{ add $index 1 }}) + {{ $source.name }} +

+ {{ end }} + {{ end }} +
+
+ {{ partial "resources-related-content.html" . }} +
+
+
+{{ end }} From c88e1c31e27040282e3b7d39cea9f3de20a2f312 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 16:51:24 -0400 Subject: [PATCH 17/30] update faq card padding --- assets/scss/components/_faq-topic.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index a40eb11635..f0f83013cb 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -97,7 +97,7 @@ background-color: #fff; max-height: 12rem; border-radius: 1rem; - padding: 1rem 2rem; + padding: 1.5rem; margin-bottom: 1.5rem; box-shadow: 0 6px 12px rgba(0, 0, 0, 0.05); transition: all 0.3s ease; From 1ec1a16ace92b1da5713c35eb41547c2e574e550 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 19:53:46 -0400 Subject: [PATCH 18/30] box shadow update --- assets/scss/components/_faq-topic.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index f0f83013cb..4e543b999d 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -41,8 +41,8 @@ &__article { background-color: #fff; - box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05); - border-radius: 0.5rem; + box-shadow: 0 0px 4px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.1); + border-radius: 1rem; padding: 2rem; display: flex; flex-direction: column; @@ -99,7 +99,7 @@ border-radius: 1rem; padding: 1.5rem; margin-bottom: 1.5rem; - box-shadow: 0 6px 12px rgba(0, 0, 0, 0.05); + box-shadow: 0 0px 4px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.1); transition: all 0.3s ease; display: flex; justify-content: space-between; From 3d3e689d12f977c9e4337853fca76562a2fe9ae1 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 20:08:08 -0400 Subject: [PATCH 19/30] update related content partial to conditionally render --- .../partials/resources-related-content.html | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/layouts/partials/resources-related-content.html b/layouts/partials/resources-related-content.html index 8035089313..e6e298f5d1 100644 --- a/layouts/partials/resources-related-content.html +++ b/layouts/partials/resources-related-content.html @@ -1,14 +1,20 @@ -

Related Content:

-
- {{ range .Params.related }} - {{ $page := printf "resources/articles/%s" . }} - {{ with $.Site.GetPage $page }} - {{ partial "faq-card.html" . }} - {{ end }} +{{ $relatedPages := slice }} - {{ $page := printf "resources/faqs/%s" . }} - {{ with $.Site.GetPage $page }} +{{ range .Params.related }} + {{ $article := $.Site.GetPage (printf "resources/articles/%s" .) }} + {{ $faq := $.Site.GetPage (printf "resources/faqs/%s" .) }} + {{ if $article }} + {{ $relatedPages = $relatedPages | append $article }} + {{ else if $faq }} + {{ $relatedPages = $relatedPages | append $faq }} + {{ end }} +{{ end }} + +{{ if gt (len $relatedPages) 0 }} +

Related Content:

+
+ {{ range $relatedPages }} {{ partial "faq-card.html" . }} {{ end }} - {{ end }} -
+
+{{ end }} From 0ce5a5458a910dd131675c391e246d19442e0a8e Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 20:27:34 -0400 Subject: [PATCH 20/30] update faq page layout --- assets/scss/components/_faq-question.scss | 16 ++++++++-------- layouts/_default/faq-question.html | 17 ++++++++--------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index 0e439ee782..18c572b268 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -19,19 +19,23 @@ margin-bottom: 1.5rem; } + &__contributors { + margin-bottom: 1.5rem; + font-size: 1.15rem; + } + &__summary { font-size: 1.5rem; - margin-top: 2rem; - margin-bottom: 3.4rem; + margin-bottom: 3.5rem; } &__body { font-size: 1.15rem; - margin-bottom: 4rem; + margin-bottom: 3.5rem; } &__sources { - margin-bottom: 2.5rem; + margin-top: 2rem; a { color: #c40729; } @@ -44,8 +48,4 @@ color: #c40729; } } - - &__contributors { - margin-bottom: 2.5rem; - } } diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index 18f2c1d9ed..fa735c6f72 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -3,12 +3,20 @@

{{ .Title }}

+ {{ with .Params.contributors }} +

+ Contributors: {{ delimit . ", " }} +

+ {{ end }}

Summary: {{ .Params.summary }}

{{ .Content }}
+
{{ with .Params.sources }}

Links and Sources:

@@ -20,15 +28,6 @@

Links and Sources:

{{ end }} {{ end }}
-
-

Contributors:

- {{ range .Params.contributors }} -

{{ . }}

- {{ end }} -
-
{{ end }} From f7c0ea1d19d142676dd8e6659c44834339863189 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 20:56:07 -0400 Subject: [PATCH 21/30] change links and sources to dropdown --- assets/scss/components/_faq-question.scss | 25 ++++++++++++++++++++++- layouts/_default/faq-question.html | 14 ++++++------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index 18c572b268..bde049a196 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -35,7 +35,9 @@ } &__sources { - margin-top: 2rem; + cursor: pointer; + margin-bottom: 1.5rem; + a { color: #c40729; } @@ -47,5 +49,26 @@ a:visited { color: #c40729; } + + summary { + max-width: fit-content; + font-size: 1.15rem; + margin-bottom: 0.5rem; + list-style: none; + &::-webkit-details-marker { + display: none; + } + } + + summary::after { + content: " ▼"; + margin-left: 0.5rem; + font-size: 0.85rem; + } + + &[open] summary::after { + content: " ▲"; + font-size: 0.85rem; + } } } diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index fa735c6f72..12f61fef13 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -14,19 +14,19 @@

{{ .Title }}

{{ .Content }}
- -
- {{ with .Params.sources }} -

Links and Sources:

+ {{ with .Params.sources }} +
+ View Links and Sources {{ range $index, $source := . }}

({{ add $index 1 }}) {{ $source.name }}

{{ end }} - {{ end }} +
+ {{ end }} +
From 6fab1667864f5db65961116927b5cec0703d9c85 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 21:31:09 -0400 Subject: [PATCH 22/30] update articles and faqs for consistency --- assets/scss/components/_article-question.scss | 49 +++++++------------ assets/scss/components/_faq-question.scss | 10 ++-- .../articles/first-year-course-selection.md | 16 ++++-- .../articles/making-your-perfect-schedule.md | 2 +- content/resources/articles/test-article.md | 3 +- layouts/_default/article-question.html | 20 +++++--- layouts/_default/faq-question.html | 8 ++- 7 files changed, 58 insertions(+), 50 deletions(-) diff --git a/assets/scss/components/_article-question.scss b/assets/scss/components/_article-question.scss index 0c64ae8af0..ac9dfa61cb 100644 --- a/assets/scss/components/_article-question.scss +++ b/assets/scss/components/_article-question.scss @@ -14,11 +14,17 @@ } &__title { - font-size: 2.7rem; + font-size: 2.5rem; font-weight: 700; margin-bottom: 1.5rem; } + &__contributors { + font-size: 1.15rem; + margin-bottom: 1.5rem; + } + + &__questions { a { text-decoration: none; @@ -37,45 +43,20 @@ &__summary { font-size: 1.5rem; margin-top: 1rem; - margin-bottom: 1rem; + margin-bottom: 1.5rem; } &__last-updated { - color: red; - margin-bottom: 2rem; + color: #c40729; + margin-bottom: 1.5rem; } &__body { font-size: 1.15rem; - margin-bottom: 4rem; - } + margin: 3rem 0; + } - &__related-content { - } - - &__articles { - display: grid; - grid-template-columns: 1fr 1fr; - gap: 2.5rem; - align-items: stretch; - } - - &__questions { - a { - text-decoration: none; - - h3 { - color: #000; - font-weight: 700; - } - - p { - margin-top: 0.75rem; - } - } - } - - &__sources { + &__sources { margin-bottom: 2.5rem; a { color: #c40729; @@ -90,3 +71,7 @@ } } } + +.end-line { + margin-bottom: 2.5rem; +} diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index bde049a196..09d088a3fd 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -14,7 +14,7 @@ } &__title { - font-size: 2.7rem; + font-size: 2.5rem; font-weight: 700; margin-bottom: 1.5rem; } @@ -26,6 +26,11 @@ &__summary { font-size: 1.5rem; + margin-bottom: 1.5rem; + } + + &__last-updated { + color: #c40729; margin-bottom: 3.5rem; } @@ -50,8 +55,7 @@ color: #c40729; } - summary { - max-width: fit-content; + summary { font-size: 1.15rem; margin-bottom: 0.5rem; list-style: none; diff --git a/content/resources/articles/first-year-course-selection.md b/content/resources/articles/first-year-course-selection.md index 7c2856195e..18ff0a63c0 100644 --- a/content/resources/articles/first-year-course-selection.md +++ b/content/resources/articles/first-year-course-selection.md @@ -3,9 +3,19 @@ title: "First-Year Course Selection Guide: Student Edition" date: 2025-06-02T00:00:00Z last_updated: 2025-06-02T00:00:00Z draft: false -layout: faq-question +layout: article-question summary: "An overview of recommended first-year COMP, MATH, and elective courses, along with common scheduling options to help you plan your timetable effectively." contributors: -- "Jacc" +- "test" sources: ---- \ No newline at end of file + - name: Test Name + link: https://ccss.carleton.ca/ +related: +- first-year-course-selection +- making-your-perfect-schedule +--- +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer laoreet fringilla elit, vel volutpat mi cursus eu. Maecenas id lacinia nisi. Vestibulum tincidunt orci in turpis commodo, eu sollicitudin mi imperdiet. Nullam in est quis mi malesuada iaculis. Mauris pellentesque quam est, vitae porta ante mattis ac. Nam porta sapien vel facilisis scelerisque. Integer arcu purus, molestie a massa sed, ultricies dictum libero. In aliquet ex nisi, condimentum sollicitudin sapien condimentum ut. Aliquam erat volutpat. Fusce volutpat risus odio. + +Sed tempus massa quis eros fermentum finibus. Cras maximus eu lorem eu sodales. Pellentesque venenatis sed ex ut bibendum. Duis laoreet mauris nulla, ac iaculis ex hendrerit sed. Aliquam euismod felis enim, et ultrices felis volutpat eu. Maecenas ante enim, interdum dapibus erat quis, semper pharetra nulla. Nullam luctus nisl eu imperdiet placerat. Pellentesque et felis sit amet enim elementum porta. Mauris elementum ex non auctor dictum. In volutpat justo a purus vulputate interdum. Aliquam molestie massa ullamcorper, facilisis mauris sit amet, condimentum orci. Vestibulum eu consectetur risus. Nulla pulvinar mi et tellus imperdiet, eu gravida risus molestie. Sed sed consequat neque, non pharetra mauris. Vivamus ut lacus a odio auctor rhoncus vel consequat orci. Duis sed turpis cursus, pharetra velit lacinia, sodales orci. + +Curabitur risus sapien, maximus quis enim at, ornare tincidunt ex. Integer luctus vel odio quis sodales. Nullam at ornare turpis. Integer consectetur odio sed mattis finibus. Pellentesque nulla nulla, tincidunt non pharetra sed, tempor vitae enim. Pellentesque est dui, bibendum non leo eget, vehicula mollis ipsum. In rhoncus metus diam, et eleifend velit tristique vitae. Aliquam leo libero, consequat in pellentesque quis, pellentesque vitae felis. Praesent libero felis, varius ac auctor quis, vehicula eget dolor. Fusce fermentum vel risus eget pulvinar. \ No newline at end of file diff --git a/content/resources/articles/making-your-perfect-schedule.md b/content/resources/articles/making-your-perfect-schedule.md index 32351b327d..5a94eeb837 100644 --- a/content/resources/articles/making-your-perfect-schedule.md +++ b/content/resources/articles/making-your-perfect-schedule.md @@ -3,7 +3,7 @@ title: "Making the Perfect Schedule" date: 2025-06-02T00:00:00Z last_updated: 2025-06-02T00:00:00Z draft: false -layout: faq-question +layout: article-question summary: "A collection of tips and tricks to help you build your ideal first-year schedule and navigate course planning with confidence." contributors: - "Jacc" diff --git a/content/resources/articles/test-article.md b/content/resources/articles/test-article.md index 0def9b8006..da9c1a6cf6 100644 --- a/content/resources/articles/test-article.md +++ b/content/resources/articles/test-article.md @@ -5,7 +5,8 @@ last_updated: 2025-05-26T00:00:00Z draft: false layout: article-question summary: "Test Summary" -written_by: Test Writer +contributors: + - "Test Writer" sources: - name: Test Name link: https://ccss.carleton.ca/ diff --git a/layouts/_default/article-question.html b/layouts/_default/article-question.html index 8e24320bb2..1098ca2e28 100644 --- a/layouts/_default/article-question.html +++ b/layouts/_default/article-question.html @@ -3,9 +3,11 @@

{{ .Title }}

-
-

Written by: {{ .Params.written_by }}

-
+ {{ with .Params.contributors }} +
+ Written by: {{ delimit . ", " }} +
+ {{ end }}
{{ .Params.summary }}
@@ -13,20 +15,22 @@

Written by: {{ .Params.written_by }}

Last Updated: {{ .Params.last_updated | time | dateFormat "January 2, 2006" }}
+
{{ .Content }}
-
- {{ with .Params.sources }} -

Links and Sources:

+
+ {{ with .Params.sources }} +
+ View Links and Sources {{ range $index, $source := . }}

({{ add $index 1 }}) {{ $source.name }}

{{ end }} - {{ end }} -
+ + {{ end }}
{{ partial "resources-related-content.html" . }}
diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index 12f61fef13..83980dfb72 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -5,12 +5,16 @@

{{ .Title }}

{{ with .Params.contributors }}

- Contributors: {{ delimit . ", " }} + Contributors: {{ delimit . ", " }}

{{ end }}

- Summary: {{ .Params.summary }} + Summary: {{ .Params.summary }}

+
+ Last Updated: + {{ .Params.last_updated | time | dateFormat "January 2, 2006" }} +
{{ .Content }}
From 8eb6b77d7d76665744b896b8fc777125a5890201 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 21:31:24 -0400 Subject: [PATCH 23/30] linting fixes --- assets/scss/components/_article-question.scss | 7 +++---- assets/scss/components/_faq-question.scss | 2 +- layouts/_default/article-question.html | 8 ++++---- layouts/_default/faq-question.html | 4 +--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/assets/scss/components/_article-question.scss b/assets/scss/components/_article-question.scss index ac9dfa61cb..0c8b605418 100644 --- a/assets/scss/components/_article-question.scss +++ b/assets/scss/components/_article-question.scss @@ -24,7 +24,6 @@ margin-bottom: 1.5rem; } - &__questions { a { text-decoration: none; @@ -54,9 +53,9 @@ &__body { font-size: 1.15rem; margin: 3rem 0; - } + } - &__sources { + &__sources { margin-bottom: 2.5rem; a { color: #c40729; @@ -73,5 +72,5 @@ } .end-line { - margin-bottom: 2.5rem; + margin-bottom: 2.5rem; } diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index 09d088a3fd..c1c992cfa4 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -55,7 +55,7 @@ color: #c40729; } - summary { + summary { font-size: 1.15rem; margin-bottom: 0.5rem; list-style: none; diff --git a/layouts/_default/article-question.html b/layouts/_default/article-question.html index 1098ca2e28..1ec847ee25 100644 --- a/layouts/_default/article-question.html +++ b/layouts/_default/article-question.html @@ -4,10 +4,10 @@

{{ .Title }}

{{ with .Params.contributors }} -
+
Written by: {{ delimit . ", " }}
- {{ end }} + {{ end }}
{{ .Params.summary }}
@@ -15,11 +15,11 @@

{{ .Title }}

Last Updated: {{ .Params.last_updated | time | dateFormat "January 2, 2006" }}
-
+
{{ .Content }}
-
+
{{ with .Params.sources }}
View Links and Sources diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index 83980dfb72..74c50e578d 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -8,9 +8,7 @@

{{ .Title }}

Contributors: {{ delimit . ", " }}

{{ end }} -

- Summary: {{ .Params.summary }} -

+

Summary: {{ .Params.summary }}

Last Updated: {{ .Params.last_updated | time | dateFormat "January 2, 2006" }} From 2bd387b31060b7280c57e7a9f1445f030e512fc1 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 21:33:38 -0400 Subject: [PATCH 24/30] update front matter fields in schedule article md --- content/resources/articles/making-your-perfect-schedule.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/content/resources/articles/making-your-perfect-schedule.md b/content/resources/articles/making-your-perfect-schedule.md index 5a94eeb837..3d6e2408e9 100644 --- a/content/resources/articles/making-your-perfect-schedule.md +++ b/content/resources/articles/making-your-perfect-schedule.md @@ -6,6 +6,11 @@ draft: false layout: article-question summary: "A collection of tips and tricks to help you build your ideal first-year schedule and navigate course planning with confidence." contributors: -- "Jacc" +- "test" sources: + - name: Test Name + link: https://ccss.carleton.ca/ +related: +- first-year-course-selection +- making-your-perfect-schedule --- \ No newline at end of file From f04e79742b7ccafa80a0917f0b85b8aa63b51a71 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sat, 7 Jun 2025 22:10:48 -0400 Subject: [PATCH 25/30] update mobile font sizes --- assets/scss/components/_article-question.scss | 25 +++++++++++++++++++ assets/scss/components/_faq-question.scss | 25 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/assets/scss/components/_article-question.scss b/assets/scss/components/_article-question.scss index 0c8b605418..fd2d79608b 100644 --- a/assets/scss/components/_article-question.scss +++ b/assets/scss/components/_article-question.scss @@ -69,6 +69,31 @@ color: #c40729; } } + + @media (max-width: 768px) { + &__title { + font-size: 1.5rem; + line-height: 1.2; + } + + &__summary { + font-size: 1.1rem; + line-height: 1.4; + } + &__contributors { + font-size: 1rem; + } + &__body { + font-size: 1rem; + line-height: 1.4; + } + &__sources { + font-size: 1rem; + } + &__last-updated { + font-size: 1rem; + } + } } .end-line { diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index c1c992cfa4..4b344137fa 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -75,4 +75,29 @@ font-size: 0.85rem; } } + + @media (max-width: 768px) { + &__title { + font-size: 1.5rem; + line-height: 1.2; + } + + &__summary { + font-size: 1.1rem; + line-height: 1.4; + } + &__contributors { + font-size: 1rem; + } + &__body { + font-size: 1rem; + line-height: 1.4; + } + &__sources { + font-size: 1rem; + } + &__last-updated { + font-size: 1rem; + } + } } From ab36c418bd6d237ae67c93b784b9b2bf0893da8e Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sun, 8 Jun 2025 16:41:01 -0400 Subject: [PATCH 26/30] article cards sizing and layout changes --- assets/scss/components/_faq-topic.scss | 87 ++++++++++++++++---------- layouts/partials/article-card.html | 2 +- 2 files changed, 55 insertions(+), 34 deletions(-) diff --git a/assets/scss/components/_faq-topic.scss b/assets/scss/components/_faq-topic.scss index 4e543b999d..21af173ea7 100644 --- a/assets/scss/components/_faq-topic.scss +++ b/assets/scss/components/_faq-topic.scss @@ -34,7 +34,26 @@ &__articles { display: grid; - grid-template-columns: 1fr 1fr; + grid-template-columns: repeat(auto-fit, minmax(225px, 1fr)); + + @media (max-width: 600px) { + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + } + + // grid-template-columns: 1fr 1fr 1fr 1fr; + + // @media (max-width: 1100px) { + // grid-template-columns: 1fr 1fr 1fr; + // } + + // @media (max-width: 900px) { + // grid-template-columns: 1fr 1fr; + // } + + // @media (max-width: 600px) { + // grid-template-columns: 1fr; + // } + gap: 2.5rem; align-items: stretch; } @@ -53,18 +72,23 @@ flex-grow: 1; } - h3 { - min-height: 3rem; + h4 { + min-height: 4rem; + + @media (max-width: 600px) { + min-height: 2.5rem; + } + font-weight: 700; - font-size: 1.25rem; margin: 0 0 1.5rem 0; + font-size: 1.15rem; } p { color: #5f5f5f; margin-bottom: 1.5rem; font-weight: 500; - font-size: 1rem; + font-size: 0.9rem; } a { @@ -85,10 +109,12 @@ h3 { color: #000; font-weight: 700; + font-size: 1.15rem; } p { margin-top: 0.75rem; + font-size: 0.9rem; } } } @@ -112,7 +138,7 @@ h3 { font-weight: 700; - font-size: 1.25rem; + font-size: 1.15rem; margin: 0; } @@ -137,37 +163,32 @@ } @media (max-width: 768px) { - &__articles { - grid-template-columns: 1fr; - gap: 2.5rem; - - h3 { - font-size: 1.25rem; - line-height: 1.35; - } + h3 { + font-size: 1.25rem; + line-height: 1.35; + } - p { - font-size: 1rem; - line-height: 1.4; - } + p { + font-size: 1rem; + line-height: 1.4; } + } - &__question { - h3 { - font-size: 1rem; - line-height: 1.35; - } + &__question { + h3 { + font-size: 1rem; + line-height: 1.35; + } - p { - font-size: 0.875rem; - line-height: 1.4; - display: -webkit-box; - -webkit-line-clamp: 2; // number of lines before ellipsis - line-clamp: 2; // standard property for compatibility - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } + p { + font-size: 0.875rem; + line-height: 1.4; + display: -webkit-box; + -webkit-line-clamp: 2; // number of lines before ellipsis + line-clamp: 2; // standard property for compatibility + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } } } diff --git a/layouts/partials/article-card.html b/layouts/partials/article-card.html index 1b7bed9dd1..da605dbfdf 100644 --- a/layouts/partials/article-card.html +++ b/layouts/partials/article-card.html @@ -1,6 +1,6 @@
-

{{ .Title }}

+

{{ .Title }}

{{ .Params.summary }}

From fe879453c43f7c4af011efd32416143c44d4b0bc Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sun, 8 Jun 2025 16:41:26 -0400 Subject: [PATCH 27/30] rearrange content order and updates for consistency --- assets/scss/components/_article-question.scss | 8 +++----- assets/scss/components/_faq-question.scss | 11 +++++------ layouts/_default/article-question.html | 8 ++++---- layouts/_default/faq-question.html | 8 ++++++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/assets/scss/components/_article-question.scss b/assets/scss/components/_article-question.scss index fd2d79608b..ccd06c08f0 100644 --- a/assets/scss/components/_article-question.scss +++ b/assets/scss/components/_article-question.scss @@ -16,12 +16,11 @@ &__title { font-size: 2.5rem; font-weight: 700; - margin-bottom: 1.5rem; + margin-bottom: 2rem; } &__contributors { - font-size: 1.15rem; - margin-bottom: 1.5rem; + margin-bottom: 1rem; } &__questions { @@ -41,8 +40,7 @@ &__summary { font-size: 1.5rem; - margin-top: 1rem; - margin-bottom: 1.5rem; + margin-bottom: 2rem; } &__last-updated { diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index 4b344137fa..3b1320be88 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -16,27 +16,26 @@ &__title { font-size: 2.5rem; font-weight: 700; - margin-bottom: 1.5rem; + margin-bottom: 2rem; } &__contributors { - margin-bottom: 1.5rem; - font-size: 1.15rem; + margin-bottom: 1rem; } &__summary { font-size: 1.5rem; - margin-bottom: 1.5rem; + margin-bottom: 2rem; } &__last-updated { color: #c40729; - margin-bottom: 3.5rem; + margin-bottom: 1.5rem; } &__body { font-size: 1.15rem; - margin-bottom: 3.5rem; + margin: 3rem 0; } &__sources { diff --git a/layouts/_default/article-question.html b/layouts/_default/article-question.html index 1ec847ee25..49274a1216 100644 --- a/layouts/_default/article-question.html +++ b/layouts/_default/article-question.html @@ -3,14 +3,14 @@

{{ .Title }}

+
+ {{ .Params.summary }} +
{{ with .Params.contributors }}
- Written by: {{ delimit . ", " }} + Written by: {{ delimit . ", " }}
{{ end }} -
- {{ .Params.summary }} -
Last Updated: {{ .Params.last_updated | time | dateFormat "January 2, 2006" }} diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index 74c50e578d..cfdc60200c 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -3,19 +3,23 @@

{{ .Title }}

+

+ Summary: {{ .Params.summary }} +

{{ with .Params.contributors }}

- Contributors: {{ delimit . ", " }} + Contributors: {{ delimit . ", " }}

{{ end }} -

Summary: {{ .Params.summary }}

Last Updated: {{ .Params.last_updated | time | dateFormat "January 2, 2006" }}
+
{{ .Content }}
+
{{ with .Params.sources }}
View Links and Sources From cfeee88001f5c47095f8f1769c2d5be478ea6db6 Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sun, 15 Jun 2025 15:11:41 -0400 Subject: [PATCH 28/30] remove test article --- content/resources/articles/test-article.md | 19 ------------------- .../resources/topics/course-registration.md | 13 ------------- 2 files changed, 32 deletions(-) delete mode 100644 content/resources/articles/test-article.md diff --git a/content/resources/articles/test-article.md b/content/resources/articles/test-article.md deleted file mode 100644 index da9c1a6cf6..0000000000 --- a/content/resources/articles/test-article.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: "Test Article" -date: 2025-05-26T00:00:00Z -last_updated: 2025-05-26T00:00:00Z -draft: false -layout: article-question -summary: "Test Summary" -contributors: - - "Test Writer" -sources: - - name: Test Name - link: https://ccss.carleton.ca/ -related: -- first-year-course-selection -- making-your-perfect-schedule ---- - ---- -Body \ No newline at end of file diff --git a/content/resources/topics/course-registration.md b/content/resources/topics/course-registration.md index bc1df81634..bcae794eb1 100644 --- a/content/resources/topics/course-registration.md +++ b/content/resources/topics/course-registration.md @@ -14,17 +14,4 @@ articles: faqs: - free-vs-breadth-electives - comp1405-z-section -- comp1405-t-section -- 1005-and-1006-vs-1405-and-1406 -- add-a-minor -- change-courses-after-registering -- how-many-courses-per-semester -- override-request -- programming-experience-before-first-year -- register-for-winter-courses-with-fall-courses -- second-year-courses-in-first-year -- which-breadth-electives -- which-courses-in-first-year -- which-programming-languagues-in-courses -- which-stream --- From 2efed4ee30da34bd1206f4891728b95333be032e Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sun, 15 Jun 2025 16:33:32 -0400 Subject: [PATCH 29/30] add empty markdown files for initial resources content --- ...n.md => first-year-course-selection-guide.md} | 0 .../articles/making-your-perfect-schedule.md | 16 ---------------- .../should-you-take-z-section-2000-level-comp.md | 15 +++++++++++++++ .../things-to-consider-while-making-schedule.md | 15 +++++++++++++++ .../articles/useful-carleton-webpages.md | 15 +++++++++++++++ .../articles/what-are-some-useful-minors.md | 15 +++++++++++++++ .../articles/which-electives-should-I-take.md | 15 +++++++++++++++ .../resources/faqs/are-all-sections-the-same.md | 15 +++++++++++++++ ...an-I-take-2000-level-courses-in-first-year.md | 15 +++++++++++++++ .../faqs/comp-1005-1006-vs-1405-1406.md | 15 +++++++++++++++ .../faqs/contact-for-registration-help.md | 15 +++++++++++++++ .../faqs/course-does-not-have-instructor.md | 15 +++++++++++++++ .../faqs/how-do-I-register-for-courses.md | 15 +++++++++++++++ .../faqs/how-many-courses-in-a-semester.md | 15 +++++++++++++++ content/resources/faqs/lectures-vs-tutorials.md | 15 +++++++++++++++ content/resources/faqs/override-request.md | 15 +++++++++++++++ .../faqs/scheduled-vs-unscheduled-courses.md | 15 +++++++++++++++ .../faqs/should-I-register-for-both-terms.md | 15 +++++++++++++++ .../resources/faqs/stat-2507-in-first-year.md | 15 +++++++++++++++ .../faqs/switch-courses-after-registering.md | 15 +++++++++++++++ content/resources/faqs/what-are-time-tickets.md | 15 +++++++++++++++ .../which-courses-can-I-take-as-electives.md | 15 +++++++++++++++ .../faqs/which-courses-in-first-year.md | 15 +++++++++++++++ content/resources/topics/course-registration.md | 8 ++------ 24 files changed, 317 insertions(+), 22 deletions(-) rename content/resources/articles/{first-year-course-selection.md => first-year-course-selection-guide.md} (100%) delete mode 100644 content/resources/articles/making-your-perfect-schedule.md create mode 100644 content/resources/articles/should-you-take-z-section-2000-level-comp.md create mode 100644 content/resources/articles/things-to-consider-while-making-schedule.md create mode 100644 content/resources/articles/useful-carleton-webpages.md create mode 100644 content/resources/articles/what-are-some-useful-minors.md create mode 100644 content/resources/articles/which-electives-should-I-take.md create mode 100644 content/resources/faqs/are-all-sections-the-same.md create mode 100644 content/resources/faqs/can-I-take-2000-level-courses-in-first-year.md create mode 100644 content/resources/faqs/comp-1005-1006-vs-1405-1406.md create mode 100644 content/resources/faqs/contact-for-registration-help.md create mode 100644 content/resources/faqs/course-does-not-have-instructor.md create mode 100644 content/resources/faqs/how-do-I-register-for-courses.md create mode 100644 content/resources/faqs/how-many-courses-in-a-semester.md create mode 100644 content/resources/faqs/lectures-vs-tutorials.md create mode 100644 content/resources/faqs/override-request.md create mode 100644 content/resources/faqs/scheduled-vs-unscheduled-courses.md create mode 100644 content/resources/faqs/should-I-register-for-both-terms.md create mode 100644 content/resources/faqs/stat-2507-in-first-year.md create mode 100644 content/resources/faqs/switch-courses-after-registering.md create mode 100644 content/resources/faqs/what-are-time-tickets.md create mode 100644 content/resources/faqs/which-courses-can-I-take-as-electives.md create mode 100644 content/resources/faqs/which-courses-in-first-year.md diff --git a/content/resources/articles/first-year-course-selection.md b/content/resources/articles/first-year-course-selection-guide.md similarity index 100% rename from content/resources/articles/first-year-course-selection.md rename to content/resources/articles/first-year-course-selection-guide.md diff --git a/content/resources/articles/making-your-perfect-schedule.md b/content/resources/articles/making-your-perfect-schedule.md deleted file mode 100644 index 3d6e2408e9..0000000000 --- a/content/resources/articles/making-your-perfect-schedule.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: "Making the Perfect Schedule" -date: 2025-06-02T00:00:00Z -last_updated: 2025-06-02T00:00:00Z -draft: false -layout: article-question -summary: "A collection of tips and tricks to help you build your ideal first-year schedule and navigate course planning with confidence." -contributors: -- "test" -sources: - - name: Test Name - link: https://ccss.carleton.ca/ -related: -- first-year-course-selection -- making-your-perfect-schedule ---- \ No newline at end of file diff --git a/content/resources/articles/should-you-take-z-section-2000-level-comp.md b/content/resources/articles/should-you-take-z-section-2000-level-comp.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/articles/should-you-take-z-section-2000-level-comp.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/articles/things-to-consider-while-making-schedule.md b/content/resources/articles/things-to-consider-while-making-schedule.md new file mode 100644 index 0000000000..e7c5cea822 --- /dev/null +++ b/content/resources/articles/things-to-consider-while-making-schedule.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/articles/useful-carleton-webpages.md b/content/resources/articles/useful-carleton-webpages.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/articles/useful-carleton-webpages.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/articles/what-are-some-useful-minors.md b/content/resources/articles/what-are-some-useful-minors.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/articles/what-are-some-useful-minors.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/articles/which-electives-should-I-take.md b/content/resources/articles/which-electives-should-I-take.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/articles/which-electives-should-I-take.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/are-all-sections-the-same.md b/content/resources/faqs/are-all-sections-the-same.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/are-all-sections-the-same.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/can-I-take-2000-level-courses-in-first-year.md b/content/resources/faqs/can-I-take-2000-level-courses-in-first-year.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/can-I-take-2000-level-courses-in-first-year.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/comp-1005-1006-vs-1405-1406.md b/content/resources/faqs/comp-1005-1006-vs-1405-1406.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/comp-1005-1006-vs-1405-1406.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/contact-for-registration-help.md b/content/resources/faqs/contact-for-registration-help.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/contact-for-registration-help.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/course-does-not-have-instructor.md b/content/resources/faqs/course-does-not-have-instructor.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/course-does-not-have-instructor.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/how-do-I-register-for-courses.md b/content/resources/faqs/how-do-I-register-for-courses.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/how-do-I-register-for-courses.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/how-many-courses-in-a-semester.md b/content/resources/faqs/how-many-courses-in-a-semester.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/how-many-courses-in-a-semester.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/lectures-vs-tutorials.md b/content/resources/faqs/lectures-vs-tutorials.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/lectures-vs-tutorials.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/override-request.md b/content/resources/faqs/override-request.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/override-request.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/scheduled-vs-unscheduled-courses.md b/content/resources/faqs/scheduled-vs-unscheduled-courses.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/scheduled-vs-unscheduled-courses.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/should-I-register-for-both-terms.md b/content/resources/faqs/should-I-register-for-both-terms.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/should-I-register-for-both-terms.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/stat-2507-in-first-year.md b/content/resources/faqs/stat-2507-in-first-year.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/stat-2507-in-first-year.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/switch-courses-after-registering.md b/content/resources/faqs/switch-courses-after-registering.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/switch-courses-after-registering.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/what-are-time-tickets.md b/content/resources/faqs/what-are-time-tickets.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/what-are-time-tickets.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/which-courses-can-I-take-as-electives.md b/content/resources/faqs/which-courses-can-I-take-as-electives.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/which-courses-can-I-take-as-electives.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/faqs/which-courses-in-first-year.md b/content/resources/faqs/which-courses-in-first-year.md new file mode 100644 index 0000000000..e55ca5b78f --- /dev/null +++ b/content/resources/faqs/which-courses-in-first-year.md @@ -0,0 +1,15 @@ +--- +title: "" +date: 2025-06-16T00:00:00Z +last_updated: 2025-06-16T00:00:00Z +draft: false +layout: article-question +summary: "" +contributors: +- +sources: + - name: + link: +related: +- +--- \ No newline at end of file diff --git a/content/resources/topics/course-registration.md b/content/resources/topics/course-registration.md index bcae794eb1..10288f9a9e 100644 --- a/content/resources/topics/course-registration.md +++ b/content/resources/topics/course-registration.md @@ -7,11 +7,7 @@ url: "/resources/course-registration" layout: resource-topic header_image_url: images/general/game_lab.jpg articles: -- first-year-course-selection -- making-your-perfect-schedule -- making-your-perfect-schedule -- first-year-course-selection +- faqs: -- free-vs-breadth-electives -- comp1405-z-section +- --- From 4c64c6493fc8c270a94e1103fd7815f53352b53b Mon Sep 17 00:00:00 2001 From: AJaccP Date: Sun, 15 Jun 2025 16:36:10 -0400 Subject: [PATCH 30/30] re add completed faqs --- content/resources/topics/course-registration.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/resources/topics/course-registration.md b/content/resources/topics/course-registration.md index 10288f9a9e..6ee51cf4a1 100644 --- a/content/resources/topics/course-registration.md +++ b/content/resources/topics/course-registration.md @@ -9,5 +9,6 @@ header_image_url: images/general/game_lab.jpg articles: - faqs: -- +- comp1405-z-section +- free-vs-breadth-electives ---