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

Add company address to footer #307

Merged
merged 6 commits into from
Oct 9, 2024
Merged

Add company address to footer #307

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
b9d457f
Add company address to footer
ianmeigh Oct 7, 2024
ef44782
Encapsulate address text in tags and set colour
ianmeigh Oct 7, 2024
bb92939
Fix linting
ianmeigh Oct 7, 2024
804ec63
Fix div nesting
ianmeigh Oct 8, 2024
8491e27
Update to improve use of semantic tags, layout & styling
ianmeigh Oct 9, 2024
25f2a5d
Remove duplicate copyright information
ianmeigh Oct 9, 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
11 changes: 10 additions & 1 deletion tbx/project_styleguide/templates/patterns/organisms/footer/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
{% wagtailcache 600 "footerlinks" current_site.pk is_pattern_library %}
{% footerlinks %}
{% endwagtailcache %}
<p class="footer__copyright">© Torchbox {% now "Y" %}</p>

<ul class="footer__socials">
<li>
Expand Down Expand Up @@ -63,6 +62,16 @@
{% endif %}
{% endwith %}
</div>
<div class="grid__footer-company">
<div class="footer__company">
<div class="footer__company-address">
<p>© Torchbox {% now "Y" %} - </p><address>3rd Floor, 15 Colston St, Bristol, BS1 5AP</address>
</div>
<div>
<p>Registered in England &amp; Wales. Company no. 3983354, VAT no. 752981011</p>
</div>
</div>
</div>
</div>

{% include "patterns/molecules/carbon-impact/carbon-impact.html" %}
Expand Down
26 changes: 22 additions & 4 deletions tbx/static_src/sass/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@
}
}

&__copyright {
margin: $spacer-mini 0 0;
}

&__socials {
display: flex;
gap: $spacer-mini * 2;
Expand Down Expand Up @@ -96,6 +92,28 @@
}
}

&__company {
display: flex;
flex-direction: column;
height: 100%;
margin: $spacer-medium 0 $spacer-mini;
color: var(--color--grey-20);

@include media-query(large) {
justify-content: center;
margin: 0;
}
}

&__company-address {
font-weight: 600;

> * {
Copy link
Member

Choose a reason for hiding this comment

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

nitpick: I'd normally discourage generic child selectors like this, but as it only affects 2 elements I'm not too worried.

font-style: normal;
display: inline;
}
}

&__carbon-impact-container {
background-color: var(--color--footer-background);
border-top: 1px solid var(--color--border);
Expand Down
12 changes: 11 additions & 1 deletion tbx/static_src/sass/components/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,17 @@
grid-column: 2 / span 4;

@include media-query(large) {
grid-column: 2 / span 12;
grid-column: 2 / span 4;
}
}

&__footer-company {
grid-column: 2 / span 4;
grid-row: 2;

@include media-query(large) {
grid-column: 10 / span 4;
grid-row: auto;
}
}

Expand Down