Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Footer #374

Merged
merged 5 commits into from
Oct 21, 2023
Merged

Footer #374

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fa323f
Update faq.yml
marceljc3 Oct 21, 2023
873a3dc
footer
marceljc3 Oct 21, 2023
ba018ce
Update _footer.scss
marceljc3 Oct 21, 2023
a174169
A
marceljc3 Oct 21, 2023
de8fa37
Update _footer.scss
marceljc3 Oct 21, 2023
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
15 changes: 13 additions & 2 deletions assets/scss/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.footer {
background-color: black;
height: 15vh;
height: 25vh;
color: white;
display: flex;
flex-direction: column;
Expand All @@ -18,5 +18,16 @@
justify-content: space-between;
width: 14rem;
font-size: 1.5rem;
margin-bottom: 1.2rem;
margin-bottom: 0.6rem;
margin-top: 0.1rem;
// this margin just makes the spacing look better
// can probs play around with it more
}

.footer-text {
text-align: center;
font-size: 16px;
b {
font-size: 20px;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you make this rem?

}
}
2 changes: 0 additions & 2 deletions data/faq.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
- question: "How do I join the Carleton Computer Science Society?"
answer: "The Carleton Computer Science Society represents all students within Carleton's Computer Science programs. That means that if you're in CS, you're already a member!"
- question: "Will there be in person events in the 2022–2023 academic year?"
answer: "Yes! We will be operating both in person and online during the Fall 2022 academic term."
- question: "Is the CCSS an official Carleton club / society?"
answer: "The CCSS is recognized and funded by the School of Computer Science, however, it is not registered as a CUSA club or society."
- question: "Can I attend events if I'm not a Computer Science student?"
Expand Down
9 changes: 9 additions & 0 deletions layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
<div class="footer">
<div class="footer-text">
<p>
<b>Carleton Computer Science Society</b><br />
4135 Herzberg Laboratories<br />
1125 Colonel By Drive,<br />
Ottawa, ON K1S 5B6<br /><br />
email: <a href="mailto:[email protected]">[email protected]</a>
</p>
</div>
<div class="footer-socials">
<a href="http://discord.carletoncomputersciencesociety.ca"
><i class="fab fa-discord"></i
Expand Down
Loading