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

fix: insert badge into footer #2263

Merged
merged 5 commits into from
Feb 14, 2024
Merged

fix: insert badge into footer #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0109ee2
fix: insert badge into footer
SKairinos Feb 14, 2024
3ebfeea
Merge branch 'master' into 10_years_badge
faucomte97 Feb 14, 2024
2b444fd
fix: feedback
SKairinos Feb 14, 2024
8f7c54b
Merge branch '10_years_badge' of https://github.com/ocadotechnology/c…
SKairinos Feb 14, 2024
afb8eb0
feeback
SKairinos Feb 14, 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
Binary file added portal/static/portal/img/10_years_anniversary.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 19 additions & 1 deletion portal/static/portal/sass/partials/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@
.form--row__input {
flex: 1;
}

.ten-yr-badge {
display: block;
position: static;
width: 45%;
margin: 50px 0 0 auto;
}
}

@media (max-width: $tablet-small-max-width) {
Expand All @@ -127,11 +134,17 @@
.social-media a {
@include _margin(0px, 10px, 0px, 10px);
}

.ten-yr-badge {
width: 60%;
margin: 15px auto 0 auto;
}
}
}

@media (max-width: $tablet-small-max-width) and (min-width: $tablet-small-min-width) {
.footer {

.button,
.external-links {
margin: 0;
Expand All @@ -152,5 +165,10 @@
.landscape-logo {
max-width: 60%;
}

.ten-yr-badge {
width: 20%;
margin: 0;
}
}
}
}
2 changes: 2 additions & 0 deletions portal/templates/portal/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@
<a target="_blank" href="https://www.facebook.com/codeforlifeuk/"><span class="iconify" data-icon="mdi:facebook"></span></a>
<a target="_blank" href="https://twitter.com/codeforlifeuk"><span class="iconify" data-icon="ant-design:twitter-circle-filled"></span></a>
</div>
<img class="ten-yr-badge visible-xs" title="10 years anniversary" alt="10 years anniversary" src="{% static 'portal/img/10_years_anniversary.png' %}">
<img class="landscape-logo visible-sm visible-xs" title="Code for Life" alt="Code for Life" src="{% static 'portal/img/logo_cfl_white_landscape.png' %}">
<a target="_blank" href="https://www.ocadogroup.com/our-responsible-business/corporate-responsibility/skills-for-the-future">
<img title="Ocado Group" alt="Ocado Group" src="{% static 'portal/img/logo_ocado_group_white.svg' %}">
</a>
</div>
<img class="ten-yr-badge hidden-xs" title="10 years anniversary" alt="10 years anniversary" src="{% static 'portal/img/10_years_anniversary.png' %}">
</div>
</div>
<p class="copyright">&copy; Ocado Group {% now "Y" %}</p>
Expand Down
Loading