From 77ffcc8588374a08caf33feaea386e6b2b1116d2 Mon Sep 17 00:00:00 2001 From: Igor Date: Thu, 11 Jan 2024 10:43:29 +0000 Subject: [PATCH] Improve style/layout compatibility with `govuk-frontend` changes --- mtp_cashbook/assets-src/app.scss | 1 + .../components/breadcrumb-bar/_index.scss | 5 +++++ .../components/cashbook/_credit-batches.scss | 4 ++++ .../components/cashbook/_search-header.scss | 18 ++++++++++++++---- .../templates/cashbook/new_credits.html | 2 +- 5 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 mtp_cashbook/assets-src/components/breadcrumb-bar/_index.scss diff --git a/mtp_cashbook/assets-src/app.scss b/mtp_cashbook/assets-src/app.scss index 5a25212f..72f5272d 100644 --- a/mtp_cashbook/assets-src/app.scss +++ b/mtp_cashbook/assets-src/app.scss @@ -15,6 +15,7 @@ // app components @import './display'; +@import './components/breadcrumb-bar'; @import './components/cashbook'; @import './components/disbursements'; @import './components/footer'; diff --git a/mtp_cashbook/assets-src/components/breadcrumb-bar/_index.scss b/mtp_cashbook/assets-src/components/breadcrumb-bar/_index.scss new file mode 100644 index 00000000..0f7ff70d --- /dev/null +++ b/mtp_cashbook/assets-src/components/breadcrumb-bar/_index.scss @@ -0,0 +1,5 @@ +@media print { + .mtp-breadcrumb-bar { + display: none; + } +} diff --git a/mtp_cashbook/assets-src/components/cashbook/_credit-batches.scss b/mtp_cashbook/assets-src/components/cashbook/_credit-batches.scss index fa0ea370..c144cab4 100644 --- a/mtp_cashbook/assets-src/components/cashbook/_credit-batches.scss +++ b/mtp_cashbook/assets-src/components/cashbook/_credit-batches.scss @@ -52,3 +52,7 @@ } } } + +.mtp-new-credits-help { + width: 85%; +} diff --git a/mtp_cashbook/assets-src/components/cashbook/_search-header.scss b/mtp_cashbook/assets-src/components/cashbook/_search-header.scss index a490fdea..506a4c28 100644 --- a/mtp_cashbook/assets-src/components/cashbook/_search-header.scss +++ b/mtp_cashbook/assets-src/components/cashbook/_search-header.scss @@ -1,5 +1,5 @@ .mtp-header-app-links__search { - width: 280px; + width: 18rem; .govuk-input, .govuk-button { margin: 0; @@ -7,13 +7,15 @@ .govuk-input { position: relative; - width: 220px; + width: 15rem; max-width: none; + height: 2.25rem; + font-size: 1em; } .govuk-button { - width: 38px; - height: 40px; + width: 2.25rem; + height: 2.25rem; text-indent: -200px; font-size: 1px; background: govuk-colour('blue') mtp-static-url('images/search-icon.png') no-repeat 50% 50%; @@ -49,5 +51,13 @@ @include govuk-media-query($from: desktop) { float: right; text-align: right; + + .govuk-input { + right: 3px; + } + + .govuk-button { + float: right; + } } } diff --git a/mtp_cashbook/templates/cashbook/new_credits.html b/mtp_cashbook/templates/cashbook/new_credits.html index f91c4367..ad64138d 100644 --- a/mtp_cashbook/templates/cashbook/new_credits.html +++ b/mtp_cashbook/templates/cashbook/new_credits.html @@ -207,7 +207,7 @@

{% if new_object_list %} - + {% captureoutput as body %}