diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index f5e930438..59cf901c8 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -1,5 +1,7 @@ $(() => $("time.timeago").timeago()); +$(() => GOVUK.stickAtTopWhenScrolling.init()); + $(() => GOVUK.modules.start()); $(() => $('.error-message').eq(0).parent('label').next('input').trigger('focus')); diff --git a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss new file mode 100644 index 000000000..dcb6ed677 --- /dev/null +++ b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss @@ -0,0 +1,30 @@ +// CSS adapted from +// https://github.com/alphagov/govuk_frontend_toolkit/blob/d9489a987086471fe30b4b925a81c12cd198c91d/docs/javascript.md#stick-at-top-when-scrolling + +.js-stick-at-top-when-scrolling { + + overflow: hidden; + margin-left: -$gutter-half; + margin-top: -10px; + padding: 10px 0 0 $gutter-half; + + .form-group { + margin-bottom: 20px; + } + +} + +.content-fixed { + position: fixed; + top: 0; + background: $white; + z-index: 100; + margin-top: 0; + padding-right: $gutter-half; + border-bottom: 1px solid $border-colour; + box-shadow: 0 2px 0 0 rgba($border-colour, 0.2); +} + +.shim { + display: block; +} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index a197fe5d0..29c376245 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -57,6 +57,7 @@ $path: '/static/images/'; @import 'components/list-entry'; @import 'components/letter'; @import 'components/live-search'; +@import 'components/stick-at-top-when-scrolling'; @import 'components/vendor/breadcrumbs'; @import 'components/vendor/responsive-embed'; diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index 5653db8b2..f743a1fce 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -26,9 +26,7 @@ {% endif %} - {{ template|string }} - -
+ {{ textbox( form.placeholder_value, hint='Optional' if optional_placeholder else None @@ -36,4 +34,6 @@ {{ page_footer('Next', back_link=back_link) }}
+ {{ template|string }} + {% endblock %} diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 667f55499..a4d044fba 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -54,6 +54,8 @@ gulp.task('copy:govuk_template:images', () => gulp.src(paths.template + 'assets/ gulp.task('javascripts', () => gulp .src([ paths.toolkit + 'javascripts/govuk/modules.js', + paths.toolkit + 'javascripts/govuk/stop-scrolling-at-footer.js', + paths.toolkit + 'javascripts/govuk/stick-at-top-when-scrolling.js', paths.src + 'javascripts/detailsPolyfill.js', paths.src + 'javascripts/apiKey.js', paths.src + 'javascripts/autofocus.js',