diff -u b/core/themes/seven/seven.theme b/core/themes/seven/seven.theme --- b/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -152,17 +152,8 @@ */ function seven_preprocess_admin_block_content(&$variables) { if (!empty($variables['content'])) { - // @todo Remove once theme_admin_block() is converted to Twig. - // See https://drupal.org/node/1987410 - $compact = system_admin_compact_mode(); - $variables['attributes'] = array('class' => array('admin-list')); - if ($compact) { - $variables['attributes']['class'][] = 'compact'; - } foreach ($variables['content'] as $key => $item) { - $variables['content'][$key]['label'] = Xss::filterAdmin($item['title']); $variables['content'][$key]['url'] = url($item['link_path']); - $variables['content'][$key]['description'] = Xss::filterAdmin($item['description']); } } } @@ -292,7 +283,7 @@ ); $form['advanced']['#type'] = 'container'; - $form['meta'] = array( + $form['meta'] = array ( '#attributes' => array('class' => array('entity-meta-header')), '#type' => 'container', '#group' => 'advanced', diff -u b/core/themes/seven/templates/admin-block-content.html.twig b/core/themes/seven/templates/admin-block-content.html.twig --- b/core/themes/seven/templates/admin-block-content.html.twig +++ b/core/themes/seven/templates/admin-block-content.html.twig @@ -5,15 +5,13 @@ * * Available variables: * - content: List of administrative menu items. Each menu item contains: - * - path: Path to the admin section. + * - url: Path to the admin section. * - label: Short name of the section. * - description: Description of the administrative menu item. * - attributes: HTML attributes to be added to the element. * * @see template_preprocess_admin_block_content() * @see seven_preprocess_admin_block_content() - * - * @ingroup themeable */ #} {% if content %} diff -u b/core/themes/seven/templates/custom-block-add-list.html.twig b/core/themes/seven/templates/custom-block-add-list.html.twig --- b/core/themes/seven/templates/custom-block-add-list.html.twig +++ b/core/themes/seven/templates/custom-block-add-list.html.twig @@ -9,15 +9,13 @@ * - types: A collection of all the available custom block types. * Each type contains: * - type: The custom block type, containing all the items below. - * - link: A link to add a block of this type. + * - url: A link to add a block of this type. * - description: A description of this custom block type. * - label: The title of the custom block type. * - path: A path for the link to add a block of this type. * * @see template_preprocess_custom_block_add_list() * @see seven_preprocess_custom_block_add_list() - * - * @ingroup themeable */ #}