Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f36d612
delete old faq contribution guide
AJaccP Jun 2, 2025
745ab13
update folder structure
AJaccP Jun 2, 2025
4320929
add initial article support
AJaccP Jun 2, 2025
2c3e237
add article cards
AJaccP Jun 3, 2025
0a6c8a6
update faq card design
AJaccP Jun 4, 2025
7fd300e
fix line clamp style rule
AJaccP Jun 4, 2025
f1aeb74
remove old empty faq markdowns
AJaccP Jun 5, 2025
2d4eabf
update free vs breadth electives faq sources link
AJaccP Jun 5, 2025
23b006b
linting fix
AJaccP Jun 5, 2025
dfac8c8
refactor article and faq cards to partials
AJaccP Jun 5, 2025
131ead6
linting fix
AJaccP Jun 5, 2025
bc16155
update style classes to use resources-topic instead of faq-topic
AJaccP Jun 7, 2025
8a1378a
add related content partial
AJaccP Jun 7, 2025
6e3499f
remove test content
AJaccP Jun 7, 2025
d23e5e2
linting fix
AJaccP Jun 7, 2025
7cb6a65
merged "resource-article-page" into "ajp/resource-page-updates"
rj-sci Jun 8, 2025
c88e1c3
update faq card padding
AJaccP Jun 7, 2025
1ec1a16
box shadow update
AJaccP Jun 7, 2025
3d3e689
update related content partial to conditionally render
AJaccP Jun 8, 2025
0ce5a54
update faq page layout
AJaccP Jun 8, 2025
f7c0ea1
change links and sources to dropdown
AJaccP Jun 8, 2025
6fab166
update articles and faqs for consistency
AJaccP Jun 8, 2025
8eb6b77
linting fixes
AJaccP Jun 8, 2025
2bd387b
update front matter fields in schedule article md
AJaccP Jun 8, 2025
f04e797
update mobile font sizes
AJaccP Jun 8, 2025
ab36c41
article cards sizing and layout changes
AJaccP Jun 8, 2025
fe87945
rearrange content order and updates for consistency
AJaccP Jun 8, 2025
cfeee88
remove test article
AJaccP Jun 15, 2025
2efed4e
add empty markdown files for initial resources content
AJaccP Jun 15, 2025
4c64c64
re add completed faqs
AJaccP Jun 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/scss/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@
@import "components/platforms";
@import "components/woa";
@import "components/volunteer";
@import "components/article-question";
99 changes: 99 additions & 0 deletions assets/scss/components/_article-question.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
.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.5rem;
font-weight: 700;
margin-bottom: 2rem;
}

&__contributors {
margin-bottom: 1rem;
}

&__questions {
a {
text-decoration: none;

h3 {
color: #000;
font-weight: 700;
}

p {
margin-top: 0.75rem;
}
}
}

&__summary {
font-size: 1.5rem;
margin-bottom: 2rem;
}

&__last-updated {
color: #c40729;
margin-bottom: 1.5rem;
}

&__body {
font-size: 1.15rem;
margin: 3rem 0;
}

&__sources {
margin-bottom: 2.5rem;
a {
color: #c40729;
}

a:hover {
color: #ff1f48;
}

a:visited {
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 {
margin-bottom: 2.5rem;
}
67 changes: 61 additions & 6 deletions assets/scss/components/_faq-question.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,34 @@
}

&__title {
font-size: 2.7rem;
font-size: 2.5rem;
font-weight: 700;
margin-bottom: 1.5rem;
margin-bottom: 2rem;
}

&__contributors {
margin-bottom: 1rem;
}

&__summary {
font-size: 1.5rem;
margin-top: 2rem;
margin-bottom: 3.4rem;
margin-bottom: 2rem;
}

&__last-updated {
color: #c40729;
margin-bottom: 1.5rem;
}

&__body {
font-size: 1.15rem;
margin-bottom: 4rem;
margin: 3rem 0;
}

&__sources {
margin-bottom: 2.5rem;
cursor: pointer;
margin-bottom: 1.5rem;

a {
color: #c40729;
}
Expand All @@ -43,5 +53,50 @@
a:visited {
color: #c40729;
}

summary {
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;
}
}

@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;
}
}
}
161 changes: 149 additions & 12 deletions assets/scss/components/_faq-topic.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
.faq-topic {
#resources-heading {
margin-bottom: 2rem;
}

#faqs-heading {
margin: 3rem 0 2rem 0;
scroll-margin-top: 7rem;
}

.resources-topic {
&__page {
background: #faf9f8;
height: fit-content;
Expand All @@ -23,35 +32,163 @@
}
}

&__questions {
&__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;
}

&__question {
&__article {
background-color: #fff;
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;
justify-content: space-between;
transition: all 0.2s ease-in-out;

.card_text {
flex-grow: 1;
}

h4 {
min-height: 4rem;

@media (max-width: 600px) {
min-height: 2.5rem;
}

font-weight: 700;
margin: 0 0 1.5rem 0;
font-size: 1.15rem;
}

p {
color: #8d8d8d;
color: #5f5f5f;
margin-bottom: 1.5rem;
font-weight: 500;
font-size: 0.9rem;
}

a {
color: #c40729;
margin-top: 1.5rem;
align-self: flex-start;
}

a:hover {
color: #ff1f48;
&:hover {
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.1);
transform: translateY(-4px);
}
}

&__questions {
a {
text-decoration: none;

h3 {
color: #000;
font-weight: 700;
font-size: 1.15rem;
}

p {
margin-top: 0.75rem;
font-size: 0.9rem;
}
}
}

&__question {
background-color: #fff;
max-height: 12rem;
border-radius: 1rem;
padding: 1.5rem;
margin-bottom: 1.5rem;
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;
align-items: center;

a:visited {
.faq-arrow {
color: #c40729;
margin-left: 0.75rem;
}

h3 {
font-weight: 700;
font-size: 1.15rem;
margin: 0;
}

p {
color: #5f5f5f;
margin: 0;
font-weight: 500;
font-size: 1rem;
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 {
box-shadow: 0 12px 24px rgba(0, 0, 0, 0.1);
transform: translateY(-4px);
}
}

@media (max-width: 768px) {
&__questions {
grid-template-columns: 1fr;
gap: 2.5rem;
h3 {
font-size: 1.25rem;
line-height: 1.35;
}

p {
font-size: 1rem;
line-height: 1.4;
}
}

&__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;
}
}
}
Loading