diff --git a/STARTERKIT/STARTERKIT.info.yml b/STARTERKIT/STARTERKIT.info.yml index 7fd89c6..f3c7473 100644 --- a/STARTERKIT/STARTERKIT.info.yml +++ b/STARTERKIT/STARTERKIT.info.yml @@ -20,7 +20,7 @@ screenshot: screenshot.png # This theme is compatible with Drupal 8 core. And it is a sub-theme of Zen. -core: 8.x +core_version_requirement: ^8 || ^9 || ^10 type: theme # Classy vs. Stable as a base theme: https://www.lullabot.com/articles/a-tale-of-two-base-themes-in-drupal-8-core # Zen uses classy as its base theme. diff --git a/STARTERKIT/templates/block/block--no-wrapper.html.twig b/STARTERKIT/templates/block/block--no-wrapper.html.twig index 60eb34a..27ac6b8 100644 --- a/STARTERKIT/templates/block/block--no-wrapper.html.twig +++ b/STARTERKIT/templates/block/block--no-wrapper.html.twig @@ -1,4 +1,4 @@ -{% extends "@STARTERKIT/containers/no-wrapper/no-wrapper.twig" %} + {# /** * @file @@ -26,6 +26,7 @@ * @see template_preprocess_block() */ #} +{% extends "@STARTERKIT/components/containers/no-wrapper/no-wrapper.twig" %} {% block heading %} {{ title_prefix }} {% if label %} diff --git a/STARTERKIT/templates/content/node.html.twig b/STARTERKIT/templates/content/node.html.twig index 2142c45..2829a54 100644 --- a/STARTERKIT/templates/content/node.html.twig +++ b/STARTERKIT/templates/content/node.html.twig @@ -1,4 +1,4 @@ -{% extends "@STARTERKIT/containers/article/article.twig" %} +{% extends "@STARTERKIT/components/containers/article/article.twig" %} {# /** * @file diff --git a/STARTERKIT/templates/layout/html.html.twig b/STARTERKIT/templates/layout/html.html.twig index 3b2d3cb..68a2167 100644 --- a/STARTERKIT/templates/layout/html.html.twig +++ b/STARTERKIT/templates/layout/html.html.twig @@ -1,4 +1,4 @@ -{% extends "@STARTERKIT/base/root/base-root.twig" %} +{% extends "@STARTERKIT/components/base/root/base-root.twig" %} {# /** * @file @@ -43,7 +43,7 @@ {% block body %} {% - include "@STARTERKIT/navigation/skip-link/skip-link.twig" with { + include "@STARTERKIT/components/navigation/skip-link/skip-link.twig" with { modifier_class: 'visually-hidden visually-hidden--focusable', url: '#main-content', text: 'Skip to main content'|t diff --git a/STARTERKIT/templates/layout/region--footer.html.twig b/STARTERKIT/templates/layout/region--footer.html.twig index 51400aa..86dc33f 100644 --- a/STARTERKIT/templates/layout/region--footer.html.twig +++ b/STARTERKIT/templates/layout/region--footer.html.twig @@ -14,7 +14,7 @@ #} {% if content %} {% - include "@STARTERKIT/components/footer/footer.twig" with { + include "@STARTERKIT/components/components/footer/footer.twig" with { modifier_class: attributes.class|safe_join(' '), attributes: attributes.removeAttribute('class'), content: content diff --git a/STARTERKIT/templates/navigation/breadcrumb.html.twig b/STARTERKIT/templates/navigation/breadcrumb.html.twig index 8497cb6..3b6fca6 100644 --- a/STARTERKIT/templates/navigation/breadcrumb.html.twig +++ b/STARTERKIT/templates/navigation/breadcrumb.html.twig @@ -9,7 +9,7 @@ #} {% if breadcrumb %} {% - include "@STARTERKIT/navigation/breadcrumb/breadcrumb.twig" with { + include "@STARTERKIT/components/navigation/breadcrumb/breadcrumb.twig" with { modifier_class: '', heading: 'Breadcrumb'|t, breadcrumb: breadcrumb diff --git a/STARTERKIT/templates/navigation/links--node.html.twig b/STARTERKIT/templates/navigation/links--node.html.twig index 1e9139e..ea3ea95 100644 --- a/STARTERKIT/templates/navigation/links--node.html.twig +++ b/STARTERKIT/templates/navigation/links--node.html.twig @@ -34,7 +34,7 @@ */ #} {% if links %} - {% embed "@STARTERKIT/navigation/more-link/more-link.twig" %} + {% embed "@STARTERKIT/components/navigation/more-link/more-link.twig" %} {% block content %} {% include "links.html.twig" %} {% endblock %} diff --git a/STARTERKIT/templates/navigation/menu-local-tasks.html.twig b/STARTERKIT/templates/navigation/menu-local-tasks.html.twig index 7b5b9f6..c5aac22 100644 --- a/STARTERKIT/templates/navigation/menu-local-tasks.html.twig +++ b/STARTERKIT/templates/navigation/menu-local-tasks.html.twig @@ -13,7 +13,7 @@ #} {% if primary %} {% - include "@STARTERKIT/navigation/tabs/tabs.twig" with { + include "@STARTERKIT/components/navigation/tabs/tabs.twig" with { heading: 'Primary tabs'|t, modifier_class: 'tabs--primary', tabs: primary @@ -22,7 +22,7 @@ {% endif %} {% if secondary %} {% - include "@STARTERKIT/navigation/tabs/tabs.twig" with { + include "@STARTERKIT/components/navigation/tabs/tabs.twig" with { heading: 'Secondary tabs'|t, modifier_class: 'tabs--secondary', tabs: secondary diff --git a/zen.info.yml b/zen.info.yml index 2512ce7..b67ed45 100644 --- a/zen.info.yml +++ b/zen.info.yml @@ -2,6 +2,6 @@ name: Zen description: 'Zen sub-themes are the ultimate starting themes for Drupal 8. Read the online docs or the included README-FIRST.txt on how to create a theme with Zen.' screenshot: zen-internals/screenshot.png -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^8 || ^9 || ^10 type: theme -base theme: classy +base theme: stable9 diff --git a/zen.theme b/zen.theme index e1415d7..98079ae 100644 --- a/zen.theme +++ b/zen.theme @@ -32,7 +32,7 @@ if (theme_get_setting('zen_rebuild_registry') && !defined('MAINTENANCE_MODE')) { * Implements HOOK_theme(). */ function zen_theme(&$existing, $type, $theme, $path) { - include_once DRUPAL_ROOT . '/' . drupal_get_path('theme', 'zen') . '/zen-internals/theme-registry.inc'; + include_once DRUPAL_ROOT . '/' . \Drupal::service('extension.list.theme')->getPath('zen') . '/zen-internals/theme-registry.inc'; return _zen_theme($existing, $type, $theme, $path); }