diff --git a/core/modules/comment/config/install/views.view.comments_recent.yml b/core/modules/comment/config/install/views.view.comments_recent.yml index 41ee8e6..7d28f27 100644 --- a/core/modules/comment/config/install/views.view.comments_recent.yml +++ b/core/modules/comment/config/install/views.view.comments_recent.yml @@ -41,7 +41,6 @@ display: row_class: '' default_row_class: true type: ul - wrapper_class: item-list class: '' row: type: fields diff --git a/core/modules/simpletest/css/simpletest.module.css b/core/modules/simpletest/css/simpletest.module.css index 71f7eea..4fa3971 100644 --- a/core/modules/simpletest/css/simpletest.module.css +++ b/core/modules/simpletest/css/simpletest.module.css @@ -35,7 +35,7 @@ table#simpletest-form-table tr.simpletest-group label { display: inline; } -div.message > div.item-list { +div.message > div.item-list, div.message > ul { font-weight: normal; } diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css index 37623e6..0bda13d 100644 --- a/core/modules/system/css/system.theme.css +++ b/core/modules/system/css/system.theme.css @@ -21,24 +21,6 @@ td.active { } /** - * Markup generated by item-list.html.twig. - */ -.item-list .title { - font-weight: bold; -} -.item-list ul { - margin: 0 0 0.75em 0; - padding: 0; -} -.item-list ul li { - margin: 0 0 0.25em 1.5em; /* LTR */ - padding: 0; -} -[dir="rtl"] .item-list ul li { - margin: 0 1.5em 0.25em 0; -} - -/** * Markup generated by Form API. */ .form-item, diff --git a/core/modules/system/src/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php index c1ad1c7..52962e6 100644 --- a/core/modules/system/src/Tests/Theme/FunctionsTest.php +++ b/core/modules/system/src/Tests/Theme/FunctionsTest.php @@ -45,21 +45,21 @@ function testItemList() { // Verify that empty items produce the empty string. $variables = array(); $variables['empty'] = 'No items found.'; - $expected = '
No items found.
'; + $expected = 'No items found.'; $this->assertThemeOutput('item_list', $variables, $expected, 'Empty %callback generates empty string.'); // Verify that empty items produce the empty string with title. $variables = array(); $variables['title'] = 'Some title'; $variables['empty'] = 'No items found.'; - $expected = '

Some title

No items found.
'; + $expected = '

Some title

No items found.'; $this->assertThemeOutput('item_list', $variables, $expected, 'Empty %callback generates empty string with title.'); // Verify that title set to 0 is output. $variables = array(); $variables['title'] = 0; $variables['empty'] = 'No items found.'; - $expected = '

0

No items found.
'; + $expected = '

0

No items found.'; $this->assertThemeOutput('item_list', $variables, $expected, '%callback with title set to 0 generates a title.'); // Verify that title set to a render array is output. @@ -68,7 +68,7 @@ function testItemList() { '#markup' => 'Render array', ); $variables['empty'] = 'No items found.'; - $expected = '

Render array

No items found.
'; + $expected = '

Render array

No items found.'; $this->assertThemeOutput('item_list', $variables, $expected, '%callback with title set to a render array generates a title.'); // Verify that empty text is not displayed when there are list items. @@ -76,7 +76,7 @@ function testItemList() { $variables['title'] = 'Some title'; $variables['empty'] = 'No items found.'; $variables['items'] = array('Un', 'Deux', 'Trois'); - $expected = '

Some title

'; + $expected = '

Some title

'; $this->assertThemeOutput('item_list', $variables, $expected, '%callback does not print empty text when there are list items.'); // Verify nested item lists. @@ -137,15 +137,15 @@ function testItemList() { 'f', ); - $inner_b = '
    '; + $inner_b = '
      '; $inner_b .= '
    1. ba
    2. '; $inner_b .= '
    3. bb
    4. '; - $inner_b .= '
'; + $inner_b .= ''; - $inner_cb = '
'; + $inner_cb .= ''; $inner_c = '
'; - $expected = '
'; - $expected .= '

Some title

'; + $expected = '

Some title

'; $expected .= '
'; + $expected .= ''; $this->assertThemeOutput('item_list', $variables, $expected); } - + /** * Tests links.html.twig. */ diff --git a/core/modules/toolbar/css/toolbar.module.css b/core/modules/toolbar/css/toolbar.module.css index c2388bc..894707b 100644 --- a/core/modules/toolbar/css/toolbar.module.css +++ b/core/modules/toolbar/css/toolbar.module.css @@ -20,10 +20,8 @@ /** * Very specific overrides for Drupal system CSS. */ -.toolbar li, +.toolbar ul, .toolbar li, .toolbar .menu li, -.toolbar .item-list, -.toolbar .item-list li, .toolbar .menu li.expanded { list-style-type: none; list-style-image: none; diff --git a/core/modules/user/config/install/views.view.who_s_online.yml b/core/modules/user/config/install/views.view.who_s_online.yml index 9c0faef..98e43bb 100644 --- a/core/modules/user/config/install/views.view.who_s_online.yml +++ b/core/modules/user/config/install/views.view.who_s_online.yml @@ -55,7 +55,6 @@ display: row_class: '' default_row_class: true type: ul - wrapper_class: item-list class: '' row: type: fields diff --git a/core/modules/user/src/Tests/UserAdminListingTest.php b/core/modules/user/src/Tests/UserAdminListingTest.php index bf4681e..fc117fe 100644 --- a/core/modules/user/src/Tests/UserAdminListingTest.php +++ b/core/modules/user/src/Tests/UserAdminListingTest.php @@ -70,7 +70,7 @@ public function testUserListing() { $name = (string) $account->td[0]->span; $roles = array(); if (isset($account->td[2]->div->ul)) { - foreach ($account->td[2]->div->ul->li as $element) { + foreach ( $account->td[2]->div->ul->li as $element ) { $roles[] = (string) $element; } } diff --git a/core/modules/views/src/Plugin/views/style/HtmlList.php b/core/modules/views/src/Plugin/views/style/HtmlList.php index d965792..b98b030 100644 --- a/core/modules/views/src/Plugin/views/style/HtmlList.php +++ b/core/modules/views/src/Plugin/views/style/HtmlList.php @@ -46,7 +46,6 @@ protected function defineOptions() { $options['type'] = array('default' => 'ul'); $options['class'] = array('default' => ''); - $options['wrapper_class'] = array('default' => 'item-list'); return $options; } @@ -62,13 +61,6 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#options' => array('ul' => $this->t('Unordered list'), 'ol' => $this->t('Ordered list')), '#default_value' => $this->options['type'], ); - $form['wrapper_class'] = array( - '#title' => $this->t('Wrapper class'), - '#description' => $this->t('The class to provide on the wrapper, outside the list.'), - '#type' => 'textfield', - '#size' => '30', - '#default_value' => $this->options['wrapper_class'], - ); $form['class'] = array( '#title' => $this->t('List class'), '#description' => $this->t('The class to provide on the list element itself.'), diff --git a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php b/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php index 0642eff..96ed330 100644 --- a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php +++ b/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php @@ -33,26 +33,18 @@ function testDefaultRowClasses() { $output = $view->preview(); $output = drupal_render($output); - // Check that an empty class attribute is not added if the wrapper class is - // not set. - $this->assertTrue(strpos($output, '
') !== FALSE, 'Empty class is not added to DIV when class is not set'); - // Check that an empty class attribute is not added if the list class is // not set. $this->assertTrue(strpos($output, '