changing button and grid positions instead

DEFRA · Jan 9, 2025 · 8f33f64 · 8f33f64
1 parent b813434
commit 8f33f64
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 62 deletions.
diff --git a/packages/gafl-webapp-service/assets/sass/rod-licensing/_general.scss b/packages/gafl-webapp-service/assets/sass/rod-licensing/_general.scss
@@ -114,31 +114,17 @@ div.initially-hidden {
   white-space: nowrap;
 }
 
-.page-layout {
-  display: flex;
-  flex-direction: row;
-}
-
-.page-layout__summary {
-  order: 2;
-  flex: 0 0 30%;
-  margin-right: 2em;
-}
-
-.page-layout__main {
-  order: 2;
-  flex: 1;
-}
-
 @media (max-width: 640px) {
-  .page-layout {
-    flex-direction: column;
+  .govuk-button {
+    position: absolute;
+    bottom: 0px;
+    left: 15px;
+    right: 15px;
+    width: auto;
   }
 
-  .page-layout__summary,
-  .page-layout__main {
-    flex: none;
-    width: 100%;
-    margin-right: 0;
+  .govuk-grid-row {
+    position: relative;
+    padding-bottom: 75px;
   }
 }
diff --git a/packages/gafl-webapp-service/src/pages/macros/standard-form.njk b/packages/gafl-webapp-service/src/pages/macros/standard-form.njk
@@ -8,45 +8,36 @@
 {% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
 
 {% block content %}
-<div class="govuk-grid-row page-layout">
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        {{ errorSummary(error, errorMap, mssgs.there_is_a_problem) }}
+        <form method="post" novalidate>
 
-<!-- Pricing summary -->
-  <div class="page-layout__summary">
-    {% block pricingSummary %}{% endblock %}
-  </div>
-
-<!-- Main content -->
-  <div class="page-layout__main">
-    {{ errorSummary(error, errorMap, mssgs.there_is_a_problem) }}
-
-    <form method="post" novalidate>
-      {% block notificationContent %}{% endblock %}
-
-      {% call govukFieldset({
-        describedBy: describedByTag,
-        legend: {
-          text: title,
-          classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-3",
-          isPageHeading: true
-        }
-      }) %}
-        {% block pageContent %}{% endblock %}
-      {% endcall %}
-
-      {{ govukButton({
-        attributes: { id: 'continue' },
-        preventDoubleClick: true,
-        name: "continue",
-        text: mssgs.continue,
-        classes: "govuk-!-margin-top-5"
-      }) }}
-      {{ csrf() }}
-    </form>
-  </div>
-
-  {# <!-- Pricing summary -->
-  <div class="govuk-grid-column-one-third page-layout__summary">
-    {% block pricingSummary %}{% endblock %}
-  </div> #}
+          {% block notificationContent %}{% endblock %}
+
+            {% call govukFieldset({
+              describedBy: describedByTag,
+              legend: {
+                text: title,
+                classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-3",
+                isPageHeading: true
+              }
+            }) %}
 
+                {% block pageContent %}{% endblock %}
+
+            {% endcall %}
+
+            {{ govukButton({
+                attributes: { id: 'continue' },
+                preventDoubleClick: true,
+                name: "continue",
+                text: mssgs.continue,
+                classes: "govuk-!-margin-top-5"
+            }) }}
+            {{ csrf() }}
+        </form>
+    </div>
+    {% block pricingSummary %}{% endblock %}
+</div>
 {% endblock %}