Skip to content

Feature/fix erroneous comma on address #196

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

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

Feature/fix erroneous comma on address #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e4946f
Add contiional logic to contact card component.
Chapabu Jan 31, 2020
52252ea
Markup address card properly.
Chapabu Jan 31, 2020
20da8bf
Remove italic text from address element.
Chapabu Jan 31, 2020
692cc49
Add a cheeky space
Chapabu Jan 31, 2020
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
5 changes: 4 additions & 1 deletion assets/sass/base/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

*,
*::before,
*::after {
Expand Down Expand Up @@ -83,6 +82,10 @@ svg:not(:root) {
display: none;
}

address {
font-style: normal;
}

@media screen and (min-width: px2em(800px)) {
body {
@include font(18px, 32px);
Expand Down
18 changes: 14 additions & 4 deletions components/04-blocks/contact-card/contact-card.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
<div class="ContactCard vcard">
<div class="ContactCard-item">
<span class="fn org">{{contactOrg}}</span>,<br>
<span class="street-address">{{contactStreet}}</span>,<br>
<span class="locality">{{contactTown}}</span>,<br>
<span class="postal-code">{{contactPostcode}}</span>
<address itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
{% if contactOrg %}
<span class="fn org">{{contactOrg}}</span>,<br>
{% endif %}
{% if contactStreet %}
<span class="street-address" itemprop="streetAddress">{{contactStreet}}</span>,<br>
{% endif %}
{% if contactTown %}
<span class="locality" itemprop="addressLocality">{{contactTown}}</span>,<br>
{% endif %}
{% if contactPostcode %}
<span class="postal-code" itemprop="postalCode">{{contactPostcode}}</span>
{% endif %}
</address>
<div>
<a class="MegaLink" href="https://www.google.com/maps/place/68+Middle+Street/@50.8210014,-0.143087,16z/data=!4m12!1m6!3m5!1s0x0:0xa4714ad834ee75d7!2s68+Middle+Street!8m2!3d50.8210794!4d-0.1430705!3m4!1s0x0:0xa4714ad834ee75d7!8m2!3d50.8210794!4d-0.1430705?hl=en-GB">Find us here.</a>
</div>
Expand Down