diff --git a/web/themes/contrib/civictheme/civictheme.layouts.yml b/web/themes/contrib/civictheme/civictheme.layouts.yml index 3578b396f..967d37e50 100644 --- a/web/themes/contrib/civictheme/civictheme.layouts.yml +++ b/web/themes/contrib/civictheme/civictheme.layouts.yml @@ -20,31 +20,3 @@ civictheme_three_columns: label: 'Sidebar Top Right' sidebar_bottom_right: label: 'Sidebar Bottom Right' - -# Deprecated and will be removed in 1.9. Switch to civictheme_three_columns. -civictheme_one_column: - label: 'Deprecated. Single column - edge to edge content.' - library: civictheme/layouts - category: 'CivicTheme Layouts' - path: templates/layout/ - template: layout--single-column - default_region: content - icon_map: - - [ content ] - regions: - content: - label: Main content - -# Deprecated and will be removed in 1.9. Switch to civictheme_three_columns. -civictheme_one_column_contained: - label: 'Deprecated. Single column - contained content' - library: civictheme/layouts - category: 'CivicTheme Layouts' - path: templates/layout/ - template: layout--single-column-contained - default_region: content - icon_map: - - [ content ] - regions: - content: - label: Main content diff --git a/web/themes/contrib/civictheme/templates/layout/layout--single-column-contained.html.twig b/web/themes/contrib/civictheme/templates/layout/layout--single-column-contained.html.twig deleted file mode 100644 index 9fd3cc634..000000000 --- a/web/themes/contrib/civictheme/templates/layout/layout--single-column-contained.html.twig +++ /dev/null @@ -1,25 +0,0 @@ -{# -/** - * @file - * CivicTheme implementation to display a one-column contained layout. - * - * Available variables: - * - content: The content for this layout. - * - modifier_class: CSS modifying class - * - * @deprecated in CivicTheme 1.8.0, will be removed in CivicTheme 1.9.0. Use - * layout--three-columns.html.twig instead. - */ -#} - -{% if content %} -
-
- {% block content_block %} -
- {{ content }} -
- {% endblock %} -
-
-{% endif %} diff --git a/web/themes/contrib/civictheme/templates/layout/layout--single-column.html.twig b/web/themes/contrib/civictheme/templates/layout/layout--single-column.html.twig deleted file mode 100644 index ae90fc672..000000000 --- a/web/themes/contrib/civictheme/templates/layout/layout--single-column.html.twig +++ /dev/null @@ -1,25 +0,0 @@ -{# -/** - * @file - * CivicTheme implementation to display a one-column edge to edge layout. - * - * Available variables: - * - content: The content for this layout. - * - modifier_class: CSS modifying class - * - * @deprecated in CivicTheme 1.8.0, will be removed in CivicTheme 1.9.0. Use - * layout--three-columns.html.twig instead. - */ -#} - -{% if content %} -
-
- {% block content_block %} -
- {{ content }} -
- {% endblock %} -
-
-{% endif %}