Skip to content

Commit b4ba45e

Browse files
committed
Merge pull request #3783 from nhsuk/patient-session-layout-mobile
Fix layout of patient session for narrower viewports
2 parents 93fb926 + b5a8ee7 commit b4ba45e

2 files changed

Lines changed: 29 additions & 10 deletions

File tree

app/assets/stylesheets/_grid.scss

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1-
// Search filters and results
2-
.app-grid-column-filters .nhsuk-card--feature.app-filters,
3-
.app-grid-column-results > .nhsuk-card--feature,
4-
.app-grid-column-results > .nhsuk-warning-callout {
5-
margin-top: nhsuk-spacing(3);
1+
// Patient session and record
2+
.app-grid-column-patient-session {
3+
@include nhsuk-grid-column(
4+
three-quarters,
5+
$float: right,
6+
$at: large-desktop,
7+
$class: false
8+
);
9+
}
10+
11+
.app-grid-column-patient-record {
12+
@include nhsuk-grid-column(
13+
one-quarter,
14+
$float: right,
15+
$at: large-desktop,
16+
$class: false
17+
);
618
}
719

20+
// Search filters and results
821
.app-grid-column-filters {
922
@include nhsuk-grid-column(filters, $at: large-desktop, $class: false);
1023
}
@@ -13,6 +26,12 @@
1326
@include nhsuk-grid-column(results, $at: large-desktop, $class: false);
1427
}
1528

29+
.app-grid-column-filters .nhsuk-card--feature.app-filters,
30+
.app-grid-column-results > .nhsuk-card--feature,
31+
.app-grid-column-results > .nhsuk-warning-callout {
32+
margin-top: nhsuk-spacing(3);
33+
}
34+
1635
// Sticky column
1736
.app-grid-column--sticky {
1837
@include nhsuk-media-query($from: desktop) {
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<%= render "patient_sessions/header" %>
22

33
<div class="nhsuk-grid-row">
4-
<div class="nhsuk-grid-column-three-quarters">
4+
<div class="app-grid-column-patient-record">
5+
<%= render AppPatientSummaryComponent.new(@patient) %>
6+
</div>
7+
8+
<div class="app-grid-column-patient-session">
59
<%= render AppPatientSessionConsentComponent.new(@patient_session, programme: @programme) %>
610

711
<%= render AppPatientSessionTriageComponent.new(@patient_session, programme: @programme, triage: @triage) %>
@@ -10,8 +14,4 @@
1014

1115
<%= render AppPatientSessionOutcomeComponent.new(@patient_session, programme: @programme) %>
1216
</div>
13-
14-
<div class="nhsuk-grid-column-one-quarter">
15-
<%= render AppPatientSummaryComponent.new(@patient) %>
16-
</div>
1717
</div>

0 commit comments

Comments
 (0)