Skip to content

Commit

Permalink
Improve style/layout compatibility with govuk-frontend changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ushkarev committed Jan 11, 2024
1 parent 4b4fc36 commit 77ffcc8
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
1 change: 1 addition & 0 deletions mtp_cashbook/assets-src/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

// app components
@import './display';
@import './components/breadcrumb-bar';
@import './components/cashbook';
@import './components/disbursements';
@import './components/footer';
Expand Down
5 changes: 5 additions & 0 deletions mtp_cashbook/assets-src/components/breadcrumb-bar/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@media print {
.mtp-breadcrumb-bar {
display: none;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,7 @@
}
}
}

.mtp-new-credits-help {
width: 85%;
}
18 changes: 14 additions & 4 deletions mtp_cashbook/assets-src/components/cashbook/_search-header.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
.mtp-header-app-links__search {
width: 280px;
width: 18rem;

.govuk-input, .govuk-button {
margin: 0;
}

.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%;
Expand Down Expand Up @@ -49,5 +51,13 @@
@include govuk-media-query($from: desktop) {
float: right;
text-align: right;

.govuk-input {
right: 3px;
}

.govuk-button {
float: right;
}
}
}
2 changes: 1 addition & 1 deletion mtp_cashbook/templates/cashbook/new_credits.html
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ <h2 class="govuk-heading-m">
<thead>
{% if new_object_list %}
<tr class="govuk-!-display-none-print">
<td colspan="{% if request.pre_approval_required %}5{% else %}4{% endif %}" class="mtp-table__cell--compact">
<td colspan="{% if request.pre_approval_required %}5{% else %}4{% endif %}" class="mtp-table__cell--compact mtp-new-credits-help">

{% captureoutput as body %}
<p>
Expand Down

0 comments on commit 77ffcc8

Please sign in to comment.