Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dist/css/styles.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/scss/06-components/forms/__index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
@import 'text-input';
@import 'tfa-form';
@import 'submit';
@import 'hakuvahti-confirmation';
23 changes: 23 additions & 0 deletions src/scss/06-components/forms/_hakuvahti-confirmation.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.hakuvahti-confirmation {
.page-divider + .components {
@include breakpoint($breakpoint-l) {
margin-top: $spacing-quadruple;
}
}

p {
@include font('body');
}

p:first-child {
margin-top: 0;
}

.form-submit {
margin-top: $spacing-double;

@include breakpoint($breakpoint-m) {
margin-top: $spacing-quadruple;
}
}
}
2 changes: 1 addition & 1 deletion src/scss/06-components/messages/_announcement.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ $-announcement-link-padding: $spacing-three-quarters;
}
}

//Add padding when announcement is present on front page without breadcrumb
// Add padding when announcement is present on front page without breadcrumb
.is-front:not(:has(.hds-breadcrumb)) .announcement {
padding-block-start: $spacing;
}
13 changes: 13 additions & 0 deletions templates/module/helfi_hakuvahti/hakuvahti-action-wrapper.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<article class="hakuvahti-confirmation">
<div class="page-divider"></div>
<div class="components">
{% embed "@hdbt/misc/component.twig" with { component_classes: 'component--hakuvahti-form'} %}
{% block component_content %}
{% if message %}
{% include "@hdbt/module/helfi_hakuvahti/hakuvahti-message-wrapper.twig" with { message: message } %}
{% endif %}
{{ content }}
{% endblock component_content %}
{% endembed %}
</div>
</article>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% set content %}
<p>{{ link }}</p>
{% endset %}

{% include "@hdbt/module/helfi_hakuvahti/hakuvahti-action-wrapper.twig" with { message: message, content: content } %}
5 changes: 5 additions & 0 deletions templates/module/helfi_hakuvahti/hakuvahti-form.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% set content %}
{% include '@helfi_hakuvahti/form.twig' with { action_url: action_url, button_text: button_text } %}
{% endset %}

{% include "@hdbt/module/helfi_hakuvahti/hakuvahti-action-wrapper.twig" with { content: content } %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% if message is iterable %}
{% for item in message %}
<p>{{ item }}</p>
{% endfor %}
{% else %}
<p>{{ message }}</p>
{% endif %}