Merge pull request #371 from DFE-Digital/fix-content-width

Fix content width
DFE-Digital · Jan 15, 2024 · 2619877 · 2619877
2 parents a5081ca + f762515
commit 2619877
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 104 deletions.
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPractice.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPractice.cshtml
@@ -26,63 +26,63 @@
 }
 
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
-        <span class="govuk-caption-l">Areas of practice</span>
-        <h1 class="govuk-heading-xl">@Model.Title</h1>
-    </div>
+
+    <span class="govuk-caption-l">Areas of practice</span>
+    <h1 class="govuk-heading-xl">@Model.Title</h1>
+
 </div>
 
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
-        <dl class="govuk-summary-list">
+
+    <dl class="govuk-summary-list">
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">
+                Summary
+            </dt>
+            <dd class="govuk-summary-list__value">
+                @Model.Summary
+            </dd>
+        </div>
+
+        @if (!string.IsNullOrEmpty(Model.OtherNames))
+        {
             <div class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
-                    Summary
+                    Other names
                 </dt>
                 <dd class="govuk-summary-list__value">
-                    @Model.Summary
+                    @Model.OtherNames
                 </dd>
             </div>
+        }
+    </dl>
 
-            @if (!string.IsNullOrEmpty(Model.OtherNames))
-            {
-                <div class="govuk-summary-list__row">
-                    <dt class="govuk-summary-list__key">
-                        Other names
-                    </dt>
-                    <dd class="govuk-summary-list__value">
-                        @Model.OtherNames
-                    </dd>
-                </div>
-            }
-        </dl>
-
-        <div class="govuk-accordion" data-module="govuk-accordion" id="accordion-with-summary-sections">
+    <div class="govuk-accordion" data-module="govuk-accordion" id="accordion-with-summary-sections">
 
-            @if (Model.WhatYoullDo != null)
-            {
-                await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1);
-            }
+        @if (Model.WhatYoullDo != null)
+        {
+            await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1);
+        }
 
-            @if (Model.SkillsAndKnowledge != null)
-            {
-                await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2);
-            }
+        @if (Model.SkillsAndKnowledge != null)
+        {
+            await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2);
+        }
 
-            @if (Model.WhoYouWillWorkWith != null)
-            {
-                await RenderAccordianSection("Who you'll work with", Model.WhoYouWillWorkWith, 3);
-            }
+        @if (Model.WhoYouWillWorkWith != null)
+        {
+            await RenderAccordianSection("Who you'll work with", Model.WhoYouWillWorkWith, 3);
+        }
 
-            @if (Model.HowYouWillWork != null)
-            {
-                await RenderAccordianSection("How you'll work", Model.HowYouWillWork, 4);
-            }
+        @if (Model.HowYouWillWork != null)
+        {
+            await RenderAccordianSection("How you'll work", Model.HowYouWillWork, 4);
+        }
 
-            @if (Model.CurrentOpportunities != null)
-            {
-                await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5);
-            }
-        </div>
+        @if (Model.CurrentOpportunities != null)
+        {
+            await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5);
+        }
     </div>
+
 </div>
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPracticeList.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_AreaOfPracticeList.cshtml
@@ -6,7 +6,5 @@
 @inject IRenderer<AreaOfPracticeList> _inlineAreaOfPracticeListRenderer
 
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
-        @_inlineAreaOfPracticeListRenderer.Render(Model)
-    </div>
+    @_inlineAreaOfPracticeListRenderer.Render(Model)
 </div>
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml
@@ -10,10 +10,10 @@
 
     @foreach (var group in Model.Items.Select((e, i) => new { ContentItem = e, Grouping = (i / Model.ColumnCount) }).GroupBy(e => e.Grouping))
     {
-        <div class="govuk-grid-row">
+        <div class="govuk-grid-row" style="display: flex">
             @foreach (var item in group)
             {
-                <div class="@gridClass govuk-!-margin-bottom-4">
+                <div class="@gridClass govuk-!-margin-bottom-4" style="display: flex">
                     @{ await Html.RenderContentfulPartialAsync(item.ContentItem); }
                 </div>
             }

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_DetailedRole.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_DetailedRole.cshtml
@@ -26,73 +26,69 @@
 }
 
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
-        <h1 class="govuk-heading-xl">@Model.Title</h1>
-    </div>
+    <h1 class="govuk-heading-xl">@Model.Title</h1>
 </div>
 
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
-        <dl class="govuk-summary-list">
-        @if(!string.IsNullOrEmpty(Model.SalaryRange))
+    <dl class="govuk-summary-list">
+    @if(!string.IsNullOrEmpty(Model.SalaryRange))
+    {
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">
+                Salary range
+            </dt>
+            <dd class="govuk-summary-list__value">
+                @Model.SalaryRange <span>depending on location, responsibilities and experience</span>
+            </dd>
+        </div>
+    }
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">
+                Summary
+            </dt>
+            <dd class="govuk-summary-list__value">
+                @Model.Summary
+            </dd>
+        </div>
+
+        @if (!string.IsNullOrEmpty(Model.OtherNames))
         {
             <div class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
-                    Salary range
+                    Other names
                 </dt>
                 <dd class="govuk-summary-list__value">
-                    @Model.SalaryRange <span>depending on location, responsibilities and experience</span>
+                    @Model.OtherNames
                 </dd>
             </div>
         }
-            <div class="govuk-summary-list__row">
-                <dt class="govuk-summary-list__key">
-                    Summary
-                </dt>
-                <dd class="govuk-summary-list__value">
-                    @Model.Summary
-                </dd>
-            </div>
+    </dl>
 
-            @if (!string.IsNullOrEmpty(Model.OtherNames))
-            {
-                <div class="govuk-summary-list__row">
-                    <dt class="govuk-summary-list__key">
-                        Other names
-                    </dt>
-                    <dd class="govuk-summary-list__value">
-                        @Model.OtherNames
-                    </dd>
-                </div>
-            }
-        </dl>
+    <div class="govuk-accordion" data-module="govuk-accordion" id="accordion-with-summary-sections">
 
-        <div class="govuk-accordion" data-module="govuk-accordion" id="accordion-with-summary-sections">
-
-            @if (Model.WhatYoullDo != null)
-            {
-                await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1);
-            }
+        @if (Model.WhatYoullDo != null)
+        {
+            await RenderAccordianSection("What you'll do", Model.WhatYoullDo, 1);
+        }
 
-            @if (Model.SkillsAndKnowledge != null)
-            {
-                await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2);
-            }
+        @if (Model.SkillsAndKnowledge != null)
+        {
+            await RenderAccordianSection("Skills and knowledge", Model.SkillsAndKnowledge, 2);
+        }
 
-            @if (Model.HowToBecomeOne != null)
-            {
-                await RenderAccordianSection("How to become one", Model.HowToBecomeOne, 3);
-            }
+        @if (Model.HowToBecomeOne != null)
+        {
+            await RenderAccordianSection("How to become one", Model.HowToBecomeOne, 3);
+        }
 
-            @if (Model.CareerPathsAndProgression != null)
-            {
-                await RenderAccordianSection("Career paths and progression", Model.CareerPathsAndProgression, 4);
-            }
+        @if (Model.CareerPathsAndProgression != null)
+        {
+            await RenderAccordianSection("Career paths and progression", Model.CareerPathsAndProgression, 4);
+        }
 
-            @if (Model.CurrentOpportunities != null)
-            {
-                await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5);
-            }
-        </div>
+        @if (Model.CurrentOpportunities != null)
+        {
+            await RenderAccordianSection("Current opportunities", Model.CurrentOpportunities, 5);
+        }
     </div>
 </div>
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_LinkCard.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_LinkCard.cshtml
@@ -5,7 +5,7 @@
 @model LinkCard
 @inject IRendererWithOptions<ContentLink> _contentLinkRenderer
 
-<div class="dfe-card">
+<div class="dfe-card" style="align-self: stretch">
     <div class="dfe-card-container">
         <govuk-heading level="Model.TitleLevel" display-size="3">
             @_contentLinkRenderer.Render(Model.TitleLink, new RendererOptions("govuk-link--no-visited-state dfe-card-link--header"))

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_RoleList.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_RoleList.cshtml
@@ -6,8 +6,6 @@
 @inject IRenderer<RoleList> _inlineRoleListRenderer
 
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-three-quarters">
-        <h2>@Model.Title</h2>
-        @_inlineRoleListRenderer.Render(Model)
-    </div>
+    <h2>@Model.Title</h2>
+    @_inlineRoleListRenderer.Render(Model)
 </div>