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

Improve the Footer #486

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Improve the Footer #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15e4862
finished base idea for footer
Glng3r Jun 3, 2024
d5bc7ed
ran prettier
Glng3r Jun 3, 2024
d709bdd
adjusted some spacing on the location pin
Glng3r Jun 3, 2024
b7eeacc
adjusted the spacing a bit more
Glng3r Jun 3, 2024
f8a5f33
made the pin smaller, and the address clickable
Glng3r Jun 12, 2024
4af7b6a
fixed
Glng3r Jun 12, 2024
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
24 changes: 19 additions & 5 deletions assets/scss/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.footer {
background-color: black;
color: white;
background-color: #faf9f8;
color: rgb(16, 14, 14);
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
border-top: 2px solid #c40729;
padding-bottom: 2rem;
padding-bottom: 0.5rem;

a {
color: inherit;
Expand All @@ -16,10 +16,10 @@
.footer-socials {
display: flex;
justify-content: space-between;
width: 14rem;
width: 15rem;
font-size: 1.5rem;
margin-bottom: 0.6rem;
margin-top: 0.1rem;
margin-top: 0.4rem;
// this margin just makes the spacing look better
// can probs play around with it more
}
Expand All @@ -31,3 +31,17 @@
font-size: 1.25rem;
}
}
.footer-location {
margin-top: -0.3rem;
margin-bottom: 0.3rem;
font-size: 1.1rem;
display: flex;
justify-content: center;
align-items: first baseline;
a:link {
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
}
31 changes: 19 additions & 12 deletions layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<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>
<p><b>Carleton Computer Science Society</b><br /></p>
</div>
<div>
<div class="footer-location">
<span class="underline-on-hover">
<a
id="google-maps"
href="https://www.google.com/maps/place/Herzberg+Laboratories,+Carleton+University/@45.3820948,-75.7002151,17z/data=!3m1!4b1!4m6!3m5!1s0x4cce05df66cb2091:0x63e0b51cfa79f889!8m2!3d45.3820948!4d-75.6976402!16s%2Fg%2F1trvl1gf?entry=ttu"
>
4135 Herzberg Laboratories
<i class="fas fa-map-marker-alt"></i
></a>
</span>
<br />
</div>
</div>
<div class="footer-socials">
<a href="http://discord.carletoncomputersciencesociety.ca"
Expand All @@ -22,11 +30,9 @@
<a href="https://github.com/CarletonComputerScienceSociety"
><i class="fab fa-github"></i
></a>
<a href="mailto:[email protected]"><i class="fas fa-envelope"></i></a>
</div>
<!--Added dynamic date updating with JavaScript-->
<div class="footer-copyright">
© {{ now.Year }} Carleton Computer Science Society
</div>
</div>

<script
Expand All @@ -53,6 +59,7 @@
{{- if site.Params.Staticman }}
{{- $bundle = slice $main $navbar $slideshow $faq }}
{{- end }}
{{- $bundle = $bundle | resources.Concat "js/bundle.js" | resources.Fingerprint "sha512" -}}
{{- $bundle = $bundle | resources.Concat "js/bundle.js" | resources.Fingerprint "sha512" -}}

<script type="text/javascript" src="{{ $bundle.Permalink }}" integrity="{{ $bundle.Data.Integrity }}" crossorigin="anonymous"></script>
<script type="text/javascript" src="{{ $bundle.Permalink }}" integrity="{{ $bundle.Data.Integrity }}"
crossorigin="anonymous"></script>
Loading