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

EL-1812: Update listing card styling #372

Merged
merged 4 commits into from
Nov 11, 2024
Merged

EL-1812: Update listing card styling #372

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
cd807a3
- update where items are shown on card listing
MazOneTwoOne Nov 8, 2024
68612f6
- update addresses with commas
MazOneTwoOne Nov 11, 2024
1588e13
- review comments to make bottom of list element 30px
MazOneTwoOne Nov 11, 2024
51ff2c9
Merge branch 'main' into el-1812-update-listing-card-styling
MazOneTwoOne Nov 11, 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
14 changes: 6 additions & 8 deletions fala/assets-src/sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,25 +106,23 @@ body.fala-dev {
}
}

.miles-away {
color: $govuk-secondary-text-colour;
margin-top: govuk-spacing(4);
}

.results-list-item {
margin-top: govuk-spacing(4);
border-top: 1px solid govuk-colour("mid-grey");

.telephone {
margin-top: govuk-spacing(2);
margin-top: govuk-spacing(1);
margin-bottom: govuk-spacing(2);
}

.address {
margin-top: govuk-spacing(2);
margin-top: govuk-spacing(1);
margin-bottom: 10px;
}

.website {
margin-top: govuk-spacing(2);
margin-top: govuk-spacing(0);
margin-bottom: govuk-spacing(2);
}

.categories {
Expand Down
41 changes: 18 additions & 23 deletions fala/templates/adviser/results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,39 +87,30 @@ <h1 class="govuk-heading-xl">Search results</h1>
</span>
<ul class="govuk-list results-list">
{% for item in data.results %}
<li class="results-list-item">
<li class="results-list-item govuk-!-margin-bottom-6">
<h2 class="govuk-body-l govuk-!-font-weight-bold govuk-!-margin-bottom-0 govuk-!-margin-top-5">{{ item.organisation.name }}</h2>
{% if item.distance %}
<p class="miles-away govuk-body govuk-!-margin-top-2">
<p class="govuk-body-s govuk-!-margin-top-0">
<span class="govuk-visually-hidden">{{ _('Distance') }}</span>
{% trans miles=item.distance|round(1) %}{{ miles }} miles away{% endtrans %}
</p>
{% endif %}
<h2 class="govuk-body-l govuk-!-font-weight-bold govuk-!-margin-bottom-2 govuk-!-margin-top-2">{{ item.organisation.name }}</h2>
<div class="telephone">
<span>{{ _('Telephone') }}:</span>
<span class="tel">{{ item.telephone }}</span>
</div>
<div class="address">
<span>{{ _('Address') }}:</span>
<span class="govuk-visually-hidden">{{ _('Address') }}:</span>
<span class="adr">
<span class="street-address notranslate" translate="no">{{ item.location.address }}</span>
<span class="city">{{ item.location.city }}</span>
<span class="postal-code notranslate" translate="no">{{ item.location.postcode }}</span>
</span>
<span class="notranslate" translate="no">{{ item.location.address.replace('\n', ', ') }},</span>
<span class="notranslate" translate="no">{{ item.location.city }},</span>
<span class="notranslate" translate="no">{{ item.location.postcode }}</span>
</div>
{% if item.organisation.website %}
<div class="website">
<span>{{ _('Website') }}:</span>
<a class="govuk-link" href="{{ item.organisation.website|human_to_url }}" class="url" target="_blank" rel="noopener">
{{ item.organisation.website|url_to_human + " (opens in new tab)" }}
</a>
</div>
{% endif %}
<a class="govuk-link govuk-!-display-none-print" class="url" target="_blank" rel="noopener" href="https://www.google.com/maps/search/?{{ item|google_map_params|urlencode }}">
View on map (opens in new tab)
</a>
{% if item.categories|length %}
<div class="categories">
<h3 class="govuk-heading-s govuk-!-margin-top-4 govuk-!-margin-bottom-2">{{ _('Can help with:') }}</h3>
<ul class="govuk-list govuk-list--bullet govuk-!-margin-bottom-4">
<h3 class="govuk-heading-s govuk-!-margin-top-4 govuk-!-margin-bottom-0">{{ _('Can help with') }}</h3>
<ul class="govuk-list govuk-list--bullet govuk-!-margin-top-0 govuk-!-margin-bottom-3">
{% for cat in item.categories|sort %}
<li>
{% if cat == "Housing Loss Prevention Advice Service" %}
Expand All @@ -132,9 +123,13 @@ <h3 class="govuk-heading-s govuk-!-margin-top-4 govuk-!-margin-bottom-2">{{ _('C
</ul>
</div>
{% endif %}
<a class="govuk-link govuk-!-display-none-print" class="url" target="_blank" rel="noopener" href="https://www.google.com/maps/search/?{{ item|google_map_params|urlencode }}">
View on map (opens in new tab)
</a>
{% if item.organisation.website %}
<div class="website">
<a class="govuk-link" href="{{ item.organisation.website|human_to_url }}" class="url" target="_blank" rel="noopener">
{{ item.organisation.website|url_to_human + " (opens in new tab)" }}
</a>
</div>
{% endif %}
</li>
{% endfor %}
</ul>
Expand Down