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 7a4b559..98b0ce1 100644
--- a/core/modules/comment/config/install/views.view.comments_recent.yml
+++ b/core/modules/comment/config/install/views.view.comments_recent.yml
@@ -45,7 +45,6 @@ display:
row_class: ''
default_row_class: true
type: ul
- wrapper_class: item-list
class: ''
provider: views
row:
diff --git a/core/modules/simpletest/css/simpletest.module.css b/core/modules/simpletest/css/simpletest.module.css
index 71f7eea..88c4564 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 > ul {
font-weight: normal;
}
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index 3e9180b..020b68c 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 theme_item_list().
- */
-.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 c8d068c..0e55865 100644
--- a/core/modules/system/src/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/src/Tests/Theme/FunctionsTest.php
@@ -44,21 +44,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.
@@ -67,7 +67,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.
@@ -75,7 +75,7 @@ function testItemList() {
$variables['title'] = 'Some title';
$variables['empty'] = 'No items found.';
$variables['items'] = array('Un', 'Deux', 'Trois');
- $expected = '';
+ $expected = 'Some title
';
$this->assertThemeOutput('item_list', $variables, $expected, '%callback does not print empty text when there are list items.');
// Verify nested item lists.
@@ -136,24 +136,23 @@ function testItemList() {
'f',
);
- $inner_b = '';
+ $inner_b = '';
$inner_b .= '- ba
';
$inner_b .= '- bb
';
- $inner_b .= '
';
+ $inner_b .= '';
- $inner_cb = '';
+ $inner_cb = '';
$inner_cb .= '- cba
';
$inner_cb .= '- cbb
';
- $inner_cb .= '
';
+ $inner_cb .= '';
- $inner_c = '';
+ $inner_c = '';
$inner_c .= '- ca
';
$inner_c .= '- cb' . $inner_cb . '
';
$inner_c .= '- cc
';
- $inner_c .= '
';
+ $inner_c .= '';
- $expected = '';
- $expected .= '
Some title
';
+ $expected = '
Some title
';
$expected .= '
';
$expected .= '- a
';
$expected .= '- b' . $inner_b . '
';
@@ -161,7 +160,7 @@ function testItemList() {
$expected .= '- d
';
$expected .= '';
$expected .= '- f
';
- $expected .= '
';
+ $expected .= '';
$this->assertThemeOutput('item_list', $variables, $expected);
}
diff --git a/core/modules/system/templates/item-list.html.twig b/core/modules/system/templates/item-list.html.twig
index bd71e7f..2a59319 100644
--- a/core/modules/system/templates/item-list.html.twig
+++ b/core/modules/system/templates/item-list.html.twig
@@ -19,18 +19,16 @@
*/
#}
{%- if items or empty -%}
-
- {%- if title is not empty -%}
-
{{ title }}
- {%- endif -%}
- {%- if items -%}
- <{{ list_type }}{{ attributes }}>
- {%- for item in items -%}
- {{ item.value }}
- {%- endfor -%}
- {{ list_type }}>
- {%- else -%}
- {{- empty -}}
- {%- endif -%}
-
+ {%- if title is not empty -%}
+ {{ title }}
+ {%- endif -%}
+ {%- if items -%}
+ <{{ list_type }}{{ attributes }}>
+ {%- for item in items -%}
+ {{ item.value }}
+ {%- endfor -%}
+ {{ list_type }}>
+ {%- else -%}
+ {{- empty -}}
+ {%- endif -%}
{%- endif %}
diff --git a/core/modules/toolbar/css/toolbar.module.css b/core/modules/toolbar/css/toolbar.module.css
index 06224fe..30661d7 100644
--- a/core/modules/toolbar/css/toolbar.module.css
+++ b/core/modules/toolbar/css/toolbar.module.css
@@ -20,10 +20,9 @@
/**
* Very specific overrides for Drupal system CSS.
*/
+.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 5b22082..0109ebd 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
@@ -52,7 +52,6 @@ display:
row_class: ''
default_row_class: true
type: ul
- wrapper_class: item-list
class: ''
provider: views
row:
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/templates/views-view-list.html.twig b/core/modules/views/templates/views-view-list.html.twig
index 8de787c..4c0b9d8 100644
--- a/core/modules/views/templates/views-view-list.html.twig
+++ b/core/modules/views/templates/views-view-list.html.twig
@@ -18,21 +18,14 @@
* @ingroup themeable
*/
#}
-{% if attributes -%}
-
+{% if title %}
+
{{ title }}
{% endif %}
- {% if title %}
- {{ title }}
- {% endif %}
- <{{ list.type }}{{ list.attributes }}>
+<{{ list.type }}{{ list.attributes }}>
- {% for row in rows %}
- {{ row.content }}
- {% endfor %}
+ {% for row in rows %}
+ {{ row.content }}
+ {% endfor %}
- {{ list.type }}>
-
-{% if attributes -%}
-
-{% endif %}
+{{ list.type }}>
diff --git a/core/modules/views/templates/views-view-summary.html.twig b/core/modules/views/templates/views-view-summary.html.twig
index 4d8ed8f..db9bae5 100644
--- a/core/modules/views/templates/views-view-summary.html.twig
+++ b/core/modules/views/templates/views-view-summary.html.twig
@@ -19,14 +19,12 @@
* @ingroup themeable
*/
#}
-
-
- {% for row in rows %}
- - {{ row.link }}
- {% if options.count %}
- ({{ row.count }})
- {% endif %}
-
- {% endfor %}
-
-
+
+{% for row in rows %}
+ - {{ row.link }}
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+
+{% endfor %}
+
diff --git a/core/modules/views_ui/css/views_ui.admin.theme.css b/core/modules/views_ui/css/views_ui.admin.theme.css
index 47909d9..124be4c 100644
--- a/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -912,7 +912,7 @@ td.group-title {
content: "\00A0\003E";
}
-.views-ui-dialog details .item-list {
+.views-ui-dialog details ul {
padding-left: 2em;
}
/* @end */
@@ -1059,11 +1059,11 @@ td.group-title {
/* @group HTML list */
-#views-live-preview .view-content > .item-list > ul {
+#views-live-preview .view-content > ul {
list-style-position: outside;
padding-left: 21px; /* LTR */
}
-[dir="rtl"] #views-live-preview .view-content > .item-list > ul {
+[dir="rtl"] #views-live-preview .view-content > ul {
padding-left: 0;
padding-right: 21px;
}
diff --git a/core/modules/views_ui/src/Tests/FieldUITest.php b/core/modules/views_ui/src/Tests/FieldUITest.php
index fac6e46..7fad7d7 100644
--- a/core/modules/views_ui/src/Tests/FieldUITest.php
+++ b/core/modules/views_ui/src/Tests/FieldUITest.php
@@ -42,18 +42,18 @@ public function testFieldUI() {
// Ensure that the expected tokens appear in the UI.
$edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/age';
$this->drupalGet($edit_handler_url);
- $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/fields/li');
+ $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/ul/fields/li');
$this->assertEqual((string) $result[0], '[age] == Age');
$edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/id';
$this->drupalGet($edit_handler_url);
- $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/fields/li');
+ $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/ul/fields/li');
$this->assertEqual((string) $result[0], '[age] == Age');
$this->assertEqual((string) $result[1], '[id] == ID');
$edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/name';
$this->drupalGet($edit_handler_url);
- $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/fields/li');
+ $result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/ul/fields/li');
$this->assertEqual((string) $result[0], '[age] == Age');
$this->assertEqual((string) $result[1], '[id] == ID');
$this->assertEqual((string) $result[2], '[name] == Name');
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index e53c10d..0cc6b5f 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -310,11 +310,11 @@ ul.menu li {
[dir="rtl"] .region-content ol {
padding: 0 15px 0.25em 0;
}
-.item-list ul li {
+li {
margin: 0;
padding: 0.2em 0.5em 0 0; /* LTR */
}
-[dir="rtl"] .item-list ul li {
+[dir="rtl"] li {
padding: 0.2em 0 0 0.5em;
}
ul.tips {
@@ -478,30 +478,30 @@ h1.site-name {
margin: 0;
padding: 0;
}
-.region-header #block-user-login div.item-list,
+.region-header #block-user-login ul,
.region-header #block-user-login div.description {
font-size: 0.916em;
margin: 0;
}
-.region-header #block-user-login div.item-list {
+.region-header #block-user-login ul {
clear: both;
}
.region-header #block-user-login div.description {
display: inline;
}
-.region-header #block-user-login .item-list ul {
+.region-header #block-user-login ul {
padding: 0;
line-height: 1;
}
-.region-header #block-user-login .item-list li {
+.region-header #block-user-login li {
list-style: none;
float: left; /* LTR */
padding: 3px 0 1px;
}
-.region-header #block-user-login .item-list li:last-child {
+.region-header #block-user-login li:last-child {
padding-left: 0.5em; /* LTR */
}
-[dir="rtl"] .region-header #block-user-login .item-list li:last-child {
+[dir="rtl"] .region-header #block-user-login li:last-child {
padding-left: 0;
padding-right: 0.5em;
}
@@ -543,7 +543,7 @@ h1.site-name {
[dir="rtl"] .site-branding-text,
[dir="rtl"] .region-header .block,
[dir="rtl"] .region-header #block-user-login .form-item,
-[dir="rtl"] .region-header #block-user-login .item-list li {
+[dir="rtl"] .region-header #block-user-login li {
float: right;
}
diff --git a/core/themes/seven/css/components/menus-and-lists.css b/core/themes/seven/css/components/menus-and-lists.css
index bd2d908..c68808b 100644
--- a/core/themes/seven/css/components/menus-and-lists.css
+++ b/core/themes/seven/css/components/menus-and-lists.css
@@ -1,15 +1,7 @@
/**
* Menus and lists.
*/
-.item-list ul {
- list-style-type: disc;
- list-style-image: none;
- margin: 0.25em 0 0.25em 1.5em; /* LTR */
-}
-[dir="rtl"] .item-list ul {
- margin: 0.25em 1.5em 0.25em 0;
-}
-.item-list ul li,
+li,
li.leaf,
ul.menu li {
list-style-type: disc;
@@ -18,13 +10,11 @@ ul.menu li {
ul.menu li {
margin: 0;
}
-.item-list ul li.collapsed,
-ul.menu li.collapsed {
+li.collapsed {
list-style-image: url(../../../../misc/menu-collapsed.png);
list-style-type: disc;
}
-.item-list ul li.expanded,
-ul.menu li.expanded {
+li.expanded {
list-style-image: url(../../../../misc/menu-expanded.png);
list-style-type: circle;
}
diff --git a/core/themes/seven/css/components/tables.css b/core/themes/seven/css/components/tables.css
index 8242d85..14e1c92 100644
--- a/core/themes/seven/css/components/tables.css
+++ b/core/themes/seven/css/components/tables.css
@@ -93,7 +93,7 @@ th.active > a:focus:after,
th.active > a:hover:after {
border-bottom-color: #008ee6;
}
-td .item-list ul {
+td ul {
margin: 0;
}
td.active {
diff --git a/core/themes/seven/css/components/views-ui.css b/core/themes/seven/css/components/views-ui.css
index ed33366..d6a159f 100644
--- a/core/themes/seven/css/components/views-ui.css
+++ b/core/themes/seven/css/components/views-ui.css
@@ -93,8 +93,8 @@ details.fieldset-no-legend {
/* @group Lists */
-.views-admin ul.secondary,
-.views-admin .item-list ul {
+.views-admin ul,
+.views-admin ul.secondary {
margin: 0;
padding: 0;
}