diff --git a/assets/scss/_components.scss b/assets/scss/_components.scss index 17c30af2e2..329ad1aabe 100644 --- a/assets/scss/_components.scss +++ b/assets/scss/_components.scss @@ -22,6 +22,7 @@ @import "components/page-header"; @import "components/posts"; @import "components/overlaypost"; +@import "components/resource"; @import "components/store"; @import "components/team"; @import "components/team_card"; diff --git a/assets/scss/components/_article-question.scss b/assets/scss/components/_article-question.scss index 875d8a75d9..37925dd46c 100644 --- a/assets/scss/components/_article-question.scss +++ b/assets/scss/components/_article-question.scss @@ -28,7 +28,7 @@ &__title { font-size: 2.5rem; font-weight: 700; - margin-bottom: 2rem; + margin-bottom: 1.75rem; } &__contributors { @@ -52,7 +52,7 @@ &__summary { font-size: 1.5rem; - margin-bottom: 2rem; + margin-bottom: 2.25rem; } &__last-updated { diff --git a/assets/scss/components/_faq-question.scss b/assets/scss/components/_faq-question.scss index 3b1320be88..76827317c9 100644 --- a/assets/scss/components/_faq-question.scss +++ b/assets/scss/components/_faq-question.scss @@ -36,6 +36,7 @@ &__body { font-size: 1.15rem; margin: 3rem 0; + margin-bottom: 4rem; } &__sources { diff --git a/assets/scss/components/_resource.scss b/assets/scss/components/_resource.scss new file mode 100644 index 0000000000..8b5a8c6beb --- /dev/null +++ b/assets/scss/components/_resource.scss @@ -0,0 +1,91 @@ +.resource__updated-at { + display: flex; + gap: 0.4rem; + align-items: center; + color: rgb(46, 46, 46); + padding: 1rem 0; + margin-top: -1rem; +} + +.resource__separator { + margin: 1.2em 0; + width: 5rem; + opacity: 0.25; + + &--full { + margin: 1.2em 0; + opacity: 0.25; + width: 100%; + } +} + +.resource__contributors { + display: flex; + align-items: center; + gap: 0.3rem; + font-size: 1rem; + margin-top: 1rem; + margin-bottom: 1rem; + + i { + margin-right: 0.4rem; + color: #666; + font-size: 1.1em; + } + + @media (max-width: 600px) { + flex-direction: column; + align-items: flex-start; + + i { + margin-right: 0; + margin-bottom: 0.3rem; + } + + span:first-of-type { + margin-right: 0; + margin-bottom: 0.3rem; + } + } +} + +.resource__contributors-list { + display: flex; + flex-wrap: wrap; + gap: 0.4rem; +} + +.resource__contributor-pill { + display: inline-block; + background: #ebebeb; + border-radius: 0.75rem; + padding: 0.125rem 0.7rem; + font-size: 0.875em; + color: #313131; + font-weight: 600; + line-height: 1.4; +} + +.resource__sources { + margin-top: 1rem; + + i { + color: #666 !important; + } + + a { + color: #c40729; + } + + a:hover { + color: #ff1f48; + } + + a:visited { + color: #c40729; + } + + &__heading { + margin-left: 0.4rem; + } +} 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 index e55ca5b78f..3f99553ccb 100644 --- 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 @@ -6,7 +6,8 @@ draft: false layout: article-question summary: "" contributors: -- +- Matthew MacRae-Bovell +- Aditya "Jacc" Padmakar sources: - name: link: diff --git a/content/resources/articles/why-you-should-consider-a-minor.md b/content/resources/articles/why-you-should-consider-a-minor.md index f6b6daa73c..bf46461cde 100644 --- a/content/resources/articles/why-you-should-consider-a-minor.md +++ b/content/resources/articles/why-you-should-consider-a-minor.md @@ -7,6 +7,7 @@ layout: article-question summary: "Instead of just filling elective credits with bird courses, using them toward a minor can help you stand out, deepen your skills, and explore a second area of interest." contributors: - Matthew MacRae-Bovell +- Aditya "Jacc" Padmakar sources: - name: SCS Program Requirements link: https://calendar.carleton.ca/undergrad/undergradprograms/computerscience/#Computer_Science__BCS_Honours:~:text=Statistical%20Modeling%20I-,6.%C2%A0%C2%A05.0%20credits%20in%20Breadth%20Electives,4.0,-Total%20Credits diff --git a/layouts/_default/article-question.html b/layouts/_default/article-question.html index 49274a1216..db1e283ba7 100644 --- a/layouts/_default/article-question.html +++ b/layouts/_default/article-question.html @@ -6,30 +6,46 @@

{{ .Title }}

{{ .Params.summary }}
- {{ with .Params.contributors }} -
- Written by: {{ delimit . ", " }} -
- {{ end }} -
- Last Updated: +
+ + Updated: {{ .Params.last_updated | time | dateFormat "January 2, 2006" }}
-
+
{{ .Content }}
-
+
+
+ {{ with .Params.contributors }} +
+ + + {{ range $index, $contributor := . }} + + {{ $contributor }} + + {{ end }} + + +
+ {{ end }} +
{{ with .Params.sources }} -
- View Links and Sources +
+
+ + Links and Sources +
{{ range $index, $source := . }}

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

{{ end }} -
+
{{ end }}
{{ partial "resources-related-content.html" . }} diff --git a/layouts/_default/faq-question.html b/layouts/_default/faq-question.html index cfdc60200c..2344ddd3cf 100644 --- a/layouts/_default/faq-question.html +++ b/layouts/_default/faq-question.html @@ -6,30 +6,45 @@

{{ .Title }}

Summary: {{ .Params.summary }}

- {{ with .Params.contributors }} -

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

- {{ end }} -
- Last Updated: +
+ + Updated: {{ .Params.last_updated | time | dateFormat "January 2, 2006" }}
-
+
{{ .Content }}
-
+
+
+ {{ with .Params.contributors }} +
+ + + {{ range $index, $contributor := . }} + + {{ $contributor }} + + {{ end }} + +
+ {{ end }} +
{{ with .Params.sources }} -
- View Links and Sources +
+
+ + Links and Sources +
{{ range $index, $source := . }}

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

{{ end }} -
+
{{ end }}
{{ partial "resources-related-content.html" . }}