From b3b2781444fb585e4e1d88e64e394416ca96d106 Mon Sep 17 00:00:00 2001 From: Adnan Date: Wed, 15 Oct 2025 11:31:09 +0100 Subject: [PATCH 1/7] Fix: CSS selector conflict. Layouts from the localgov_paragraphs_layout submodule (e.g. Two column simple) are experiencing conflict with similar core layouts (e.g. Two column). This is because these layouts are using the same CSS selectors as the core ones (e.g. .layout--twocol). Renaming these CSS selectors resolves this. --- .../fourcol_25_25_25_25/fourcol-25-25-25-25.css | 10 +++++----- .../layout--localgov-fourcol-25-25-25-25.html.twig | 7 +++---- .../layouts/onecol/layout--localgov-onecol.html.twig | 2 +- .../layouts/onecol/onecol.css | 4 ++-- .../layout--localgov-threecol-33-34-33.html.twig | 5 ++--- .../layouts/threecol_33_34_33/threecol_33_34_33.css | 8 ++++---- .../layouts/twocol/layout--localgov-twocol.html.twig | 2 +- .../layouts/twocol/twocol.css | 8 ++++---- 8 files changed, 22 insertions(+), 24 deletions(-) diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css index 6ca799a..e2abad5 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css @@ -1,9 +1,9 @@ /* * @file - * Provides the layout styles for layout_threecol_33_34_33. + * Provides the layout styles for localgov_layout_fourcol_33_34_33. */ -.layout--fourcol-25-25-25-25 { +.layout--localgov-fourcol-25-25-25-25 { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--fourcol-25-25-25-25 > .layout__region { +.layout--localgov-fourcol-25-25-25-25 > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--fourcol-25-25-25-25 { + .layout--localgov-fourcol-25-25-25-25 { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. @@ -30,7 +30,7 @@ } @media screen and (min-width: 60em) { - .layout--fourcol-25-25-25-25 { + .layout--localgov-fourcol-25-25-25-25 { grid-template-columns: repeat(4, 1fr); } } diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig index 18eb7a8..2cab60a 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig @@ -1,10 +1,9 @@ {# /** * @file - * Default theme implementation for a three column layout. + * Default theme implementation for a four column layout. * - * This template provides a three column 33%-34%-33% display layout, with - * additional areas for the top and the bottom. + * This template provides a four column 25%-25%-25%-25% display layout. * * Available variables: * - content: The content for this layout. @@ -16,7 +15,7 @@ {% set classes = [ 'layout', - 'layout--fourcol-25-25-25-25', + 'layout--localgov-fourcol-25-25-25-25', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig b/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig index 3a7f993..ac0c169 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig @@ -13,7 +13,7 @@ {% set classes = [ 'layout', - 'layout--onecol', + 'layout--localgov-onecol', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css index e2283c5..fa6d91f 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css +++ b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css @@ -1,7 +1,7 @@ /* * @file - * Provides the layout styles for layout_onecol. + * Provides the layout styles for localgov_layout_onecol. */ -.layout--onecol .layout__region { +.layout--localgov-onecol .layout__region { width: 100%; } diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig index c01935e..4d018fe 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig @@ -3,8 +3,7 @@ * @file * Default theme implementation for a three column layout. * - * This template provides a three column 33%-34%-33% display layout, with - * additional areas for the top and the bottom. + * This template provides a three column 33%-34%-33% display layout. * * Available variables: * - content: The content for this layout. @@ -16,7 +15,7 @@ {% set classes = [ 'layout', - 'layout--threecol-33-34-33', + 'layout--localgov-threecol-33-34-33', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css index f1db317..043e298 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css @@ -1,9 +1,9 @@ /* * @file - * Provides the layout styles for layout_threecol_33_34_33. + * Provides the layout styles for localgov_layout_threecol_33_34_33. */ -.layout--threecol-33-34-33 { +.layout--localgov-threecol-33-34-33 { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--threecol-33-34-33 > .layout__region { +.layout--localgov-threecol-33-34-33 > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--threecol-33-34-33 { + .layout--localgov-threecol-33-34-33 { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig b/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig index 0ac2d7a..7c23033 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig @@ -13,7 +13,7 @@ {% set classes = [ 'layout', - 'layout--twocol', + 'layout--localgov-twocol', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css index 342618a..4dfcce5 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css +++ b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css @@ -1,9 +1,9 @@ /* * @file - * Provides the layout styles for layout_twocol. + * Provides the layout styles for localgov_layout_twocol. */ -.layout--twocol { +.layout--localgov-twocol { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--twocol > .layout__region { +.layout--localgov-twocol > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--twocol { + .layout--localgov-twocol { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. From 45bb722419c3c4b754444f4478295103886c6af9 Mon Sep 17 00:00:00 2001 From: Adnan Date: Wed, 15 Oct 2025 14:29:44 +0100 Subject: [PATCH 2/7] Fix: CSS selector conflict for layouts. Renamed selectors which should enable better style rule inheritance. --- .../fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css | 8 ++++---- .../layout--localgov-fourcol-25-25-25-25.html.twig | 3 ++- .../layouts/onecol/layout--localgov-onecol.html.twig | 3 ++- .../localgov_paragraphs_layout/layouts/onecol/onecol.css | 2 +- .../layout--localgov-threecol-33-34-33.html.twig | 3 ++- .../layouts/threecol_33_34_33/threecol_33_34_33.css | 6 +++--- .../layouts/twocol/layout--localgov-twocol.html.twig | 3 ++- .../localgov_paragraphs_layout/layouts/twocol/twocol.css | 6 +++--- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css index e2abad5..a2e0627 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_fourcol_33_34_33. */ -.layout--localgov-fourcol-25-25-25-25 { +.layout--fourcol.layout--fourcol-25-25-25-25--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--localgov-fourcol-25-25-25-25 > .layout__region { +.layout--fourcol.layout--fourcol-25-25-25-25--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--localgov-fourcol-25-25-25-25 { + .layout--fourcol.layout--fourcol-25-25-25-25--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. @@ -30,7 +30,7 @@ } @media screen and (min-width: 60em) { - .layout--localgov-fourcol-25-25-25-25 { + .layout--fourcol.layout--fourcol-25-25-25-25--localgov { grid-template-columns: repeat(4, 1fr); } } diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig index 2cab60a..57169e5 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig @@ -15,7 +15,8 @@ {% set classes = [ 'layout', - 'layout--localgov-fourcol-25-25-25-25', + 'layout--fourcol', + 'layout--fourcol-25-25-25-25--localgov', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig b/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig index ac0c169..82a71ac 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig @@ -13,7 +13,8 @@ {% set classes = [ 'layout', - 'layout--localgov-onecol', + 'layout--onecol', + 'layout--onecol--localgov', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css index fa6d91f..547dcf8 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css +++ b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css @@ -2,6 +2,6 @@ * @file * Provides the layout styles for localgov_layout_onecol. */ -.layout--localgov-onecol .layout__region { +.layout--onecol.layout--onecol--localgov .layout__region { width: 100%; } diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig index 4d018fe..dad9050 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig @@ -15,7 +15,8 @@ {% set classes = [ 'layout', - 'layout--localgov-threecol-33-34-33', + 'layout--threecol', + 'layout--threecol-33-34-33--localgov', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css index 043e298..75d5060 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_threecol_33_34_33. */ -.layout--localgov-threecol-33-34-33 { +.layout--threecol.layout--threecol-33-34-33--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--localgov-threecol-33-34-33 > .layout__region { +.layout--threecol.layout--threecol-33-34-33--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--localgov-threecol-33-34-33 { + .layout--threecol.layout--threecol-33-34-33--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig b/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig index 7c23033..d31205f 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig @@ -13,7 +13,8 @@ {% set classes = [ 'layout', - 'layout--localgov-twocol', + 'layout--twocol', + 'layout--twocol--localgov', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css index 4dfcce5..1124968 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css +++ b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_twocol. */ -.layout--localgov-twocol { +.layout--twocol.layout--twocol--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--localgov-twocol > .layout__region { +.layout--twocol.layout--twocol--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--localgov-twocol { + .layout--twocol.layout--twocol--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. From 9cf93ae905417e7d7d2cae8cd02f73747db5310e Mon Sep 17 00:00:00 2001 From: Adnan Date: Wed, 15 Oct 2025 14:40:50 +0100 Subject: [PATCH 3/7] Fix: CSS selector conflict for layouts. Retaining older CSS selectors for backward compatibility. --- .../layout--localgov-fourcol-25-25-25-25.html.twig | 1 + .../layout--localgov-threecol-33-34-33.html.twig | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig index 57169e5..f34de0b 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig @@ -16,6 +16,7 @@ set classes = [ 'layout', 'layout--fourcol', + 'layout--fourcol-25-25-25-25', 'layout--fourcol-25-25-25-25--localgov', ] %} diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig index dad9050..ebb109a 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig @@ -16,6 +16,7 @@ set classes = [ 'layout', 'layout--threecol', + 'layout--threecol-33-34-33', 'layout--threecol-33-34-33--localgov', ] %} From 5338b20c92a9fb3a755549133f885c5b66d65e27 Mon Sep 17 00:00:00 2001 From: Adnan Date: Wed, 15 Oct 2025 15:48:55 +0100 Subject: [PATCH 4/7] Fix: CSS selector conflict for layouts. Preserving original CSS selector priority to retain backward compatibility. --- .../fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css | 8 ++++---- .../localgov_paragraphs_layout/layouts/onecol/onecol.css | 2 +- .../layouts/threecol_33_34_33/threecol_33_34_33.css | 6 +++--- .../localgov_paragraphs_layout/layouts/twocol/twocol.css | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css index a2e0627..fe2fd04 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_fourcol_33_34_33. */ -.layout--fourcol.layout--fourcol-25-25-25-25--localgov { +.layout--fourcol-25-25-25-25--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--fourcol.layout--fourcol-25-25-25-25--localgov > .layout__region { +.layout--fourcol-25-25-25-25--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--fourcol.layout--fourcol-25-25-25-25--localgov { + .layout--fourcol-25-25-25-25--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. @@ -30,7 +30,7 @@ } @media screen and (min-width: 60em) { - .layout--fourcol.layout--fourcol-25-25-25-25--localgov { + .layout--fourcol-25-25-25-25--localgov { grid-template-columns: repeat(4, 1fr); } } diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css index 547dcf8..457f662 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css +++ b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css @@ -2,6 +2,6 @@ * @file * Provides the layout styles for localgov_layout_onecol. */ -.layout--onecol.layout--onecol--localgov .layout__region { +.layout--onecol--localgov .layout__region { width: 100%; } diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css index 75d5060..9771d13 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_threecol_33_34_33. */ -.layout--threecol.layout--threecol-33-34-33--localgov { +.layout--threecol-33-34-33--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--threecol.layout--threecol-33-34-33--localgov > .layout__region { +.layout--threecol-33-34-33--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--threecol.layout--threecol-33-34-33--localgov { + .layout--threecol-33-34-33--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css index 1124968..b8b2d65 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css +++ b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_twocol. */ -.layout--twocol.layout--twocol--localgov { +.layout--twocol--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--twocol.layout--twocol--localgov > .layout__region { +.layout--twocol--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--twocol.layout--twocol--localgov { + .layout--twocol--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. From 2a87489e595d64218978fa8c50c7e87376ba3e1e Mon Sep 17 00:00:00 2001 From: Adnan Date: Tue, 23 Dec 2025 11:39:31 +0000 Subject: [PATCH 5/7] Revert "Fix: CSS selector conflict for layouts." This reverts commit 5338b20c92a9fb3a755549133f885c5b66d65e27. --- .../fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css | 8 ++++---- .../localgov_paragraphs_layout/layouts/onecol/onecol.css | 2 +- .../layouts/threecol_33_34_33/threecol_33_34_33.css | 6 +++--- .../localgov_paragraphs_layout/layouts/twocol/twocol.css | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css index fe2fd04..a2e0627 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_fourcol_33_34_33. */ -.layout--fourcol-25-25-25-25--localgov { +.layout--fourcol.layout--fourcol-25-25-25-25--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--fourcol-25-25-25-25--localgov > .layout__region { +.layout--fourcol.layout--fourcol-25-25-25-25--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--fourcol-25-25-25-25--localgov { + .layout--fourcol.layout--fourcol-25-25-25-25--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. @@ -30,7 +30,7 @@ } @media screen and (min-width: 60em) { - .layout--fourcol-25-25-25-25--localgov { + .layout--fourcol.layout--fourcol-25-25-25-25--localgov { grid-template-columns: repeat(4, 1fr); } } diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css index 457f662..547dcf8 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css +++ b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css @@ -2,6 +2,6 @@ * @file * Provides the layout styles for localgov_layout_onecol. */ -.layout--onecol--localgov .layout__region { +.layout--onecol.layout--onecol--localgov .layout__region { width: 100%; } diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css index 9771d13..75d5060 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_threecol_33_34_33. */ -.layout--threecol-33-34-33--localgov { +.layout--threecol.layout--threecol-33-34-33--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--threecol-33-34-33--localgov > .layout__region { +.layout--threecol.layout--threecol-33-34-33--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--threecol-33-34-33--localgov { + .layout--threecol.layout--threecol-33-34-33--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css index b8b2d65..1124968 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css +++ b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_twocol. */ -.layout--twocol--localgov { +.layout--twocol.layout--twocol--localgov { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--twocol--localgov > .layout__region { +.layout--twocol.layout--twocol--localgov > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--twocol--localgov { + .layout--twocol.layout--twocol--localgov { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. From 337750bc2fcf01a437b92ec57869dc4aa3bffc17 Mon Sep 17 00:00:00 2001 From: Adnan Date: Tue, 23 Dec 2025 11:39:59 +0000 Subject: [PATCH 6/7] Revert "Fix: CSS selector conflict for layouts." This reverts commit 9cf93ae905417e7d7d2cae8cd02f73747db5310e. --- .../layout--localgov-fourcol-25-25-25-25.html.twig | 1 - .../layout--localgov-threecol-33-34-33.html.twig | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig index f34de0b..57169e5 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig @@ -16,7 +16,6 @@ set classes = [ 'layout', 'layout--fourcol', - 'layout--fourcol-25-25-25-25', 'layout--fourcol-25-25-25-25--localgov', ] %} diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig index ebb109a..dad9050 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig @@ -16,7 +16,6 @@ set classes = [ 'layout', 'layout--threecol', - 'layout--threecol-33-34-33', 'layout--threecol-33-34-33--localgov', ] %} From 5c004d91be3ff5344fc0a4e91561261d9fe4a10c Mon Sep 17 00:00:00 2001 From: Adnan Date: Tue, 23 Dec 2025 11:40:24 +0000 Subject: [PATCH 7/7] Revert "Fix: CSS selector conflict for layouts." This reverts commit 45bb722419c3c4b754444f4478295103886c6af9. --- .../fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css | 8 ++++---- .../layout--localgov-fourcol-25-25-25-25.html.twig | 3 +-- .../layouts/onecol/layout--localgov-onecol.html.twig | 3 +-- .../localgov_paragraphs_layout/layouts/onecol/onecol.css | 2 +- .../layout--localgov-threecol-33-34-33.html.twig | 3 +-- .../layouts/threecol_33_34_33/threecol_33_34_33.css | 6 +++--- .../layouts/twocol/layout--localgov-twocol.html.twig | 3 +-- .../localgov_paragraphs_layout/layouts/twocol/twocol.css | 6 +++--- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css index a2e0627..e2abad5 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/fourcol-25-25-25-25.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_fourcol_33_34_33. */ -.layout--fourcol.layout--fourcol-25-25-25-25--localgov { +.layout--localgov-fourcol-25-25-25-25 { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--fourcol.layout--fourcol-25-25-25-25--localgov > .layout__region { +.layout--localgov-fourcol-25-25-25-25 > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--fourcol.layout--fourcol-25-25-25-25--localgov { + .layout--localgov-fourcol-25-25-25-25 { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. @@ -30,7 +30,7 @@ } @media screen and (min-width: 60em) { - .layout--fourcol.layout--fourcol-25-25-25-25--localgov { + .layout--localgov-fourcol-25-25-25-25 { grid-template-columns: repeat(4, 1fr); } } diff --git a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig index 57169e5..2cab60a 100644 --- a/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/fourcol/fourcol_25_25_25_25/layout--localgov-fourcol-25-25-25-25.html.twig @@ -15,8 +15,7 @@ {% set classes = [ 'layout', - 'layout--fourcol', - 'layout--fourcol-25-25-25-25--localgov', + 'layout--localgov-fourcol-25-25-25-25', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig b/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig index 82a71ac..ac0c169 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/onecol/layout--localgov-onecol.html.twig @@ -13,8 +13,7 @@ {% set classes = [ 'layout', - 'layout--onecol', - 'layout--onecol--localgov', + 'layout--localgov-onecol', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css index 547dcf8..fa6d91f 100644 --- a/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css +++ b/modules/localgov_paragraphs_layout/layouts/onecol/onecol.css @@ -2,6 +2,6 @@ * @file * Provides the layout styles for localgov_layout_onecol. */ -.layout--onecol.layout--onecol--localgov .layout__region { +.layout--localgov-onecol .layout__region { width: 100%; } diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig index dad9050..4d018fe 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/layout--localgov-threecol-33-34-33.html.twig @@ -15,8 +15,7 @@ {% set classes = [ 'layout', - 'layout--threecol', - 'layout--threecol-33-34-33--localgov', + 'layout--localgov-threecol-33-34-33', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css index 75d5060..043e298 100644 --- a/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css +++ b/modules/localgov_paragraphs_layout/layouts/threecol_33_34_33/threecol_33_34_33.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_threecol_33_34_33. */ -.layout--threecol.layout--threecol-33-34-33--localgov { +.layout--localgov-threecol-33-34-33 { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--threecol.layout--threecol-33-34-33--localgov > .layout__region { +.layout--localgov-threecol-33-34-33 > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--threecol.layout--threecol-33-34-33--localgov { + .layout--localgov-threecol-33-34-33 { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need. diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig b/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig index d31205f..7c23033 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig +++ b/modules/localgov_paragraphs_layout/layouts/twocol/layout--localgov-twocol.html.twig @@ -13,8 +13,7 @@ {% set classes = [ 'layout', - 'layout--twocol', - 'layout--twocol--localgov', + 'layout--localgov-twocol', ] %} {% if content %} diff --git a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css index 1124968..4dfcce5 100644 --- a/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css +++ b/modules/localgov_paragraphs_layout/layouts/twocol/twocol.css @@ -3,7 +3,7 @@ * Provides the layout styles for localgov_layout_twocol. */ -.layout--twocol.layout--twocol--localgov { +.layout--localgov-twocol { --lgd-page-section-gap: 0; display: grid; @@ -11,13 +11,13 @@ gap: var(--lgd-page-section-gap); } -.layout--twocol.layout--twocol--localgov > .layout__region { +.layout--localgov-twocol > .layout__region { /* To equalise the heights in each row */ display: grid; } @media screen and (min-width: 40em) { - .layout--twocol.layout--twocol--localgov { + .layout--localgov-twocol { /* If you need to add some gap between items here, you can set the --lgd-page-section-gap variable to whatever gap size you need.