From f6205603f62502536b8e14048d05555e1531b6cc Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Mon, 7 Feb 2022 17:19:38 +0100 Subject: [PATCH 1/7] initial commit of moderngov template --- .../layout/page--moderngov-page-tpl.html.twig | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 templates/layout/page--moderngov-page-tpl.html.twig diff --git a/templates/layout/page--moderngov-page-tpl.html.twig b/templates/layout/page--moderngov-page-tpl.html.twig new file mode 100644 index 0000000..8309d80 --- /dev/null +++ b/templates/layout/page--moderngov-page-tpl.html.twig @@ -0,0 +1,114 @@ +{% block header %} + {% include '@localgov_base/layout/header.html.twig' with {'page': page} %} +{% endblock %} + +
+ {breadcrumb} +
+ +
{# The "skip to content" link jumps to here. #} + +
+
+ + +
+
+ {content} +
+
+
+
+
+ +{# Begin Footer Regions #} +{% block footer_sections %} + {# + Wrap all of the "lgd-footers" in a `footer` element for semantics. + This should ensure that all the contact/housekeeping links/etc + are within the footer element to assist screenreaders and other + automated tools. + #} + +{% endblock %} +{# End Footer Regions #} From 192e027349371747b785441faccccc439247725f Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Tue, 5 Apr 2022 10:59:56 +0200 Subject: [PATCH 2/7] change template name --- ...ngov-page-tpl.html.twig => page--moderngov-template.html.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename templates/layout/{page--moderngov-page-tpl.html.twig => page--moderngov-template.html.twig} (100%) diff --git a/templates/layout/page--moderngov-page-tpl.html.twig b/templates/layout/page--moderngov-template.html.twig similarity index 100% rename from templates/layout/page--moderngov-page-tpl.html.twig rename to templates/layout/page--moderngov-template.html.twig From 6f0c91604452928ede0f1e588eaea06b8ad1278d Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Wed, 20 Apr 2022 11:58:32 +0200 Subject: [PATCH 3/7] adds class to easily center our grid --- css/layout/grid.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/layout/grid.css b/css/layout/grid.css index 03d6601..6cdfa8e 100644 --- a/css/layout/grid.css +++ b/css/layout/grid.css @@ -22,6 +22,10 @@ flex-wrap: wrap; } +.lgd-row--centered { + justify-content: center; +} + .lgd-row > * { margin-right: calc(var(--grid-column-spacing) / 2); margin-left: calc(var(--grid-column-spacing) / 2); From 90ef4c398fecce2b575ac2e68e2536bc0cedcc21 Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Fri, 22 Apr 2022 12:42:13 +0200 Subject: [PATCH 4/7] adds relative position for main canvas so toolbar is not obstructed --- css/layout/layout-utilities.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/css/layout/layout-utilities.css b/css/layout/layout-utilities.css index 32cc3fb..7d9ef70 100644 --- a/css/layout/layout-utilities.css +++ b/css/layout/layout-utilities.css @@ -2,6 +2,14 @@ @file Utility classes to drop into templates. */ +/* + Position the main canvas relative so anything further down the page that + might use absolute will not cover the admin toolbar. +*/ +.dialog-off-canvas-main-canvas { + position: relative; +} + /* The main container class that defines how wide our content area is */ From 357788fdb5e3138fb6f4ab1834e5841410039fc2 Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Fri, 22 Apr 2022 15:45:51 +0200 Subject: [PATCH 5/7] adds gitignore to subtheme generator --- scripts/create_subtheme.sh | 3 +++ scripts/subtheme-items/.gitignore | 2 ++ scripts/subtheme-items/package.json | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 scripts/subtheme-items/.gitignore diff --git a/scripts/create_subtheme.sh b/scripts/create_subtheme.sh index d450a17..2e12322 100644 --- a/scripts/create_subtheme.sh +++ b/scripts/create_subtheme.sh @@ -73,6 +73,9 @@ perl -i -pe "s/LGD_SUB_THEME_NAME/$LGD_SUB_THEME_NAME/g" * perl -i -pe "s/LGD_SUB_THEME/$LGD_SUB_THEME/g" * echo "+ variables replaced" +cp -r ../../contrib/localgov_base/scripts/subtheme-items/.gitignore . +echo "+ .gitignore file copied" + cp -r ../../contrib/localgov_base/scripts/subtheme-items/css . echo "+ default css copied" diff --git a/scripts/subtheme-items/.gitignore b/scripts/subtheme-items/.gitignore new file mode 100644 index 0000000..10ee12c --- /dev/null +++ b/scripts/subtheme-items/.gitignore @@ -0,0 +1,2 @@ +node_modules +.stylelintrc.json \ No newline at end of file diff --git a/scripts/subtheme-items/package.json b/scripts/subtheme-items/package.json index d86a198..744ba14 100644 --- a/scripts/subtheme-items/package.json +++ b/scripts/subtheme-items/package.json @@ -15,4 +15,4 @@ "stylelint-config-standard": "^22.0.0", "stylelint-order": "^4.1.0" } -} \ No newline at end of file +} From ce737965cb91b5e5c6398a5520cf1e334c48cbc1 Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Fri, 22 Apr 2022 15:46:02 +0200 Subject: [PATCH 6/7] Revert "adds gitignore to subtheme generator" This reverts commit 357788fdb5e3138fb6f4ab1834e5841410039fc2. --- scripts/create_subtheme.sh | 3 --- scripts/subtheme-items/.gitignore | 2 -- scripts/subtheme-items/package.json | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 scripts/subtheme-items/.gitignore diff --git a/scripts/create_subtheme.sh b/scripts/create_subtheme.sh index 2e12322..d450a17 100644 --- a/scripts/create_subtheme.sh +++ b/scripts/create_subtheme.sh @@ -73,9 +73,6 @@ perl -i -pe "s/LGD_SUB_THEME_NAME/$LGD_SUB_THEME_NAME/g" * perl -i -pe "s/LGD_SUB_THEME/$LGD_SUB_THEME/g" * echo "+ variables replaced" -cp -r ../../contrib/localgov_base/scripts/subtheme-items/.gitignore . -echo "+ .gitignore file copied" - cp -r ../../contrib/localgov_base/scripts/subtheme-items/css . echo "+ default css copied" diff --git a/scripts/subtheme-items/.gitignore b/scripts/subtheme-items/.gitignore deleted file mode 100644 index 10ee12c..0000000 --- a/scripts/subtheme-items/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules -.stylelintrc.json \ No newline at end of file diff --git a/scripts/subtheme-items/package.json b/scripts/subtheme-items/package.json index 744ba14..d86a198 100644 --- a/scripts/subtheme-items/package.json +++ b/scripts/subtheme-items/package.json @@ -15,4 +15,4 @@ "stylelint-config-standard": "^22.0.0", "stylelint-order": "^4.1.0" } -} +} \ No newline at end of file From 046720c4072646631bfe7d66b04d1b1e390be35a Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Fri, 22 Apr 2022 15:48:36 +0200 Subject: [PATCH 7/7] adds .gitignore to subtheme generator --- scripts/create_subtheme.sh | 3 +++ scripts/subtheme-items/.gitignore | 2 ++ scripts/subtheme-items/package.json | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 scripts/subtheme-items/.gitignore diff --git a/scripts/create_subtheme.sh b/scripts/create_subtheme.sh index d450a17..49a0212 100644 --- a/scripts/create_subtheme.sh +++ b/scripts/create_subtheme.sh @@ -73,6 +73,9 @@ perl -i -pe "s/LGD_SUB_THEME_NAME/$LGD_SUB_THEME_NAME/g" * perl -i -pe "s/LGD_SUB_THEME/$LGD_SUB_THEME/g" * echo "+ variables replaced" +cp -r ../../contrib/localgov_base/scripts/subtheme-items/.gitignore . +echo "+ .gitignore copied" + cp -r ../../contrib/localgov_base/scripts/subtheme-items/css . echo "+ default css copied" diff --git a/scripts/subtheme-items/.gitignore b/scripts/subtheme-items/.gitignore new file mode 100644 index 0000000..10ee12c --- /dev/null +++ b/scripts/subtheme-items/.gitignore @@ -0,0 +1,2 @@ +node_modules +.stylelintrc.json \ No newline at end of file diff --git a/scripts/subtheme-items/package.json b/scripts/subtheme-items/package.json index d86a198..744ba14 100644 --- a/scripts/subtheme-items/package.json +++ b/scripts/subtheme-items/package.json @@ -15,4 +15,4 @@ "stylelint-config-standard": "^22.0.0", "stylelint-order": "^4.1.0" } -} \ No newline at end of file +}