.../standard/config/install/block.block.bartik_action_links.yml | 2 +- core/profiles/standard/config/install/block.block.bartik_help.yml | 4 ++-- core/profiles/standard/config/install/block.block.bartik_tabs.yml | 4 ++-- core/themes/bartik/bartik.info.yml | 2 -- core/themes/bartik/templates/page.html.twig | 4 ---- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/core/profiles/standard/config/install/block.block.bartik_action_links.yml b/core/profiles/standard/config/install/block.block.bartik_action_links.yml index dd3123a..a6a6cc9 100644 --- a/core/profiles/standard/config/install/block.block.bartik_action_links.yml +++ b/core/profiles/standard/config/install/block.block.bartik_action_links.yml @@ -1,6 +1,6 @@ id: bartik_action_links theme: bartik -weight: -10 +weight: -20 status: true langcode: en region: content diff --git a/core/profiles/standard/config/install/block.block.bartik_help.yml b/core/profiles/standard/config/install/block.block.bartik_help.yml index 88c4f1a..4142788 100644 --- a/core/profiles/standard/config/install/block.block.bartik_help.yml +++ b/core/profiles/standard/config/install/block.block.bartik_help.yml @@ -1,9 +1,9 @@ id: bartik_help theme: bartik -weight: 0 +weight: -10 status: true langcode: en -region: help +region: content plugin: help_block settings: id: help_block diff --git a/core/profiles/standard/config/install/block.block.bartik_tabs.yml b/core/profiles/standard/config/install/block.block.bartik_tabs.yml index 559a60f..9913335 100644 --- a/core/profiles/standard/config/install/block.block.bartik_tabs.yml +++ b/core/profiles/standard/config/install/block.block.bartik_tabs.yml @@ -1,9 +1,9 @@ id: bartik_tabs theme: bartik -weight: 10 +weight: -30 status: true langcode: en -region: tabs +region: content plugin: system_tabs_block settings: id: system_tabs_block diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml index 3cd072b..68cc5fe 100644 --- a/core/themes/bartik/bartik.info.yml +++ b/core/themes/bartik/bartik.info.yml @@ -18,13 +18,11 @@ regions: header: Header primary_menu: 'Primary menu' secondary_menu: 'Secondary menu' - help: Help page_top: 'Page top' page_bottom: 'Page bottom' highlighted: Highlighted featured_top: 'Featured top' breadcrumb: Breadcrumb - tabs: Tabs content: Content sidebar_first: 'Sidebar first' sidebar_second: 'Sidebar second' diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig index cd7d9bc..f3da885 100644 --- a/core/themes/bartik/templates/page.html.twig +++ b/core/themes/bartik/templates/page.html.twig @@ -49,8 +49,6 @@ * - page.primary_menu: Items for the primary menu region. * - page.secondary_menu: Items for the secondary menu region. * - page.featured_top: Items for the featured top region. - * - page.tabs: Items for the tabs region. - * - page.help: Dynamic help text, mostly for admin pages. * - page.content: The main content of the current page. * - page.sidebar_first: Items for the first sidebar. * - page.sidebar_second: Items for the second sidebar. @@ -133,8 +131,6 @@ {% endif %} {{ title_suffix }} - {{ page.tabs }} - {{ page.help }} {{ page.content }}