Merge branch 'master' into convert-all-links-to-govuk-frontend

This commit is contained in:
Tom Byers
2020-02-24 10:12:58 +00:00
committed by GitHub
34 changed files with 468 additions and 135 deletions

View File

@@ -1,7 +0,0 @@
{% macro current_service_link(endpoint, link_text) %}
{% if current_service %}
<a class="govuk-link" href="{{ url_for(endpoint, service_id=current_service.id) }}">{{ link_text }}</a>
{% else %}
<b class="govuk-!-font-weight-bold">{{ link_text|capitalize }}</b>
{% endif %}
{% endmacro %}

View File

@@ -0,0 +1,7 @@
{% macro service_link(service, endpoint, link_text) %}
{% if service %}
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(endpoint, service_id=service.id) }}">{{ link_text }}</a>
{% else %}
<b class="govuk-!-font-weight-bold">{{ link_text|capitalize }}</b>
{% endif %}
{% endmacro %}