diff --git a/core/includes/theme.inc b/core/includes/theme.inc index aa558b2..e276a82 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1769,11 +1769,13 @@ function theme_mark($variables) { * render properties for all nested child lists. * - title: A title to be prepended to the list. * - list_type: The type of list to return (e.g. "ul", "ol"). + * - attributes: The attributes applies to the list element. * * @see http://drupal.org/node/1842756 */ function template_preprocess_item_list(&$variables) { $variables['title'] = (string) $variables['title']; + $variables['attributes']['class'][] = 'item-list'; foreach ($variables['items'] as &$item) { $attributes = array(); diff --git a/core/modules/simpletest/css/simpletest.module.css b/core/modules/simpletest/css/simpletest.module.css index 86bd04b..0c07945 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 > .item-list { font-weight: normal; } diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css index 9a0153d..30aa48d 100644 --- a/core/modules/system/css/system.theme.css +++ b/core/modules/system/css/system.theme.css @@ -26,18 +26,15 @@ td.active { /** * Markup generated by theme_item_list(). */ -.item-list .title { - font-weight: bold; -} -.item-list ul { +ul.item-list { margin: 0 0 0.75em 0; padding: 0; } -.item-list ul li { +ul.item-list li { margin: 0 0 0.25em 1.5em; /* LTR */ padding: 0; } -[dir="rtl"] .item-list ul li { +[dir="rtl"] ul.item-list li { margin: 0 1.5em 0.25em 0; } @@ -149,11 +146,11 @@ abbr.form-required, abbr.tabledrag-changed, abbr.ajax-changed { /** * Markup generated by pager.html.twig. */ -.item-list .pager { +.pager.item-list { clear: both; text-align: center; } -.item-list .pager li { +.pager.item-list li { background-image: none; display: inline; list-style-type: none; diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php index 586e1eb..6cea93b 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php @@ -126,32 +126,30 @@ 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 = '
'; + $inner_c .= ''; - $expected = '
'; - $expected .= '

Some title

'; - $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 e8d16e0..33ef010 100644 --- a/core/modules/system/templates/item-list.html.twig +++ b/core/modules/system/templates/item-list.html.twig @@ -18,19 +18,15 @@ * @ingroup themeable */ #} -{%- if items or empty -%} -
- {%- if title -%} -

{{ title }}

- {%- endif -%} - {%- if items -%} - <{{ list_type }}{{ attributes }}> - {%- for item in items -%} - {{ item.value }} - {%- endfor -%} - - {%- else -%} - {{- empty -}} - {%- endif -%} -
-{%- endif %} +{%- if title -%} +

{{ title }}

+{%- endif -%} +{%- if items -%} + <{{ list_type }}{{ attributes }}> + {%- for item in items -%} + {{ item.value }} + {%- endfor -%} + +{%- else -%} + {{- empty -}} +{%- endif -%} diff --git a/core/modules/views/templates/views-view-summary.html.twig b/core/modules/views/templates/views-view-summary.html.twig index 4d8ed8f..3fe2696 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 */ #} -
- -
+ 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 e6f0614..1600f91 100644 --- a/core/modules/views_ui/css/views_ui.admin.theme.css +++ b/core/modules/views_ui/css/views_ui.admin.theme.css @@ -1049,11 +1049,11 @@ td.group-title { /* @group HTML list */ -#views-live-preview .view-content > .item-list > ul { +#views-live-preview .view-content > ul.item-list { 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.item-list { padding-left: 0; padding-right: 21px; } diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 85c834a..c6aeacc 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -118,7 +118,7 @@ body, ul.contextual-links, ul.links, ul.primary, -.item-list .pager, +.pager, div.field-type-taxonomy-term-reference, div.messages, div.meta, @@ -265,27 +265,27 @@ table ul.links li { font-size: 0.923em; text-shadow: 0 0 0 !important; } -.item-list .pager { +.pager { font-size: 0.929em; } -.item-list .pager li { +.pager li { padding: 0; } -.item-list .pager a { +.pager a { display: inline-block; padding: 10px 15px; } -.item-list .pager .pager-first a { +.pager .pager-first a { padding: 10px 10px 10px 0; } -.item-list .pager .pager-previous a { +.pager .pager-previous a { padding: 10px 0; } -.item-list .pager .pager-current { +.pager .pager-current { padding: 0 10px; } -.item-list .pager .pager-next a, -.item-list .pager .pager-last a { +.pager .pager-next a, +.pager .pager-last a { padding: 10px 0 10px 10px; } ul.menu li { @@ -300,11 +300,11 @@ ul.menu li { [dir="rtl"] .region-content ol { padding: 2.5em 0 0.25em 0; } -.item-list ul li { +ul.item-list li { margin: 0; padding: 0.2em 0.5em 0 0; /* LTR */ } -[dir="rtl"] .item-list ul li { +[dir="rtl"] ul.item-list li { padding: 0.2em 0 0 0.5em; } ul.tips { @@ -461,21 +461,19 @@ h1#site-name { margin: 0; padding: 0; } -.region-header #block-user-login div.item-list, +.region-header #block-user-login ul.item-list, .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.item-list { clear: both; + padding: 0; + line-height: 1; } .region-header #block-user-login div.description { display: inline; } -.region-header #block-user-login .item-list ul { - padding: 0; - line-height: 1; -} .region-header #block-user-login .item-list li { list-style: none; float: left; /* LTR */ diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index aa699e0..ef1c772 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -1,15 +1,16 @@ /** - * Menus and lists. + * Generic elements. */ -.item-list ul { +ul { list-style-type: disc; list-style-image: none; margin: 0.25em 0 0.25em 1.5em; /* LTR */ } -[dir="rtl"] .item-list ul { +[dir="rtl"] ul { margin: 0.25em 1.5em 0.25em 0; } .item-list ul li, +ul.item-list li, li.leaf, ul.menu li { list-style-type: disc; @@ -18,12 +19,19 @@ ul.menu li { ul.menu li { margin: 0; } -.item-list ul li.collapsed, +ol { + list-style-type: decimal; + margin: 0.25em 0 0.25em 2em; /* LTR */ +} +[dir="rtl"] ol { + margin: 0.25em 2em 0.25em 0; +} +ul.item-list li.collapsed, ul.menu li.collapsed { list-style-image: url(../../misc/menu-collapsed.png); list-style-type: disc; } -.item-list ul li.expanded, +ul.item-list li.expanded, ul.menu li.expanded { list-style-image: url(../../misc/menu-expanded.png); list-style-type: circle; @@ -1287,7 +1295,7 @@ details.fieldset-no-legend { /* @group Lists */ .views-admin ul.secondary, -.views-admin .item-list ul { +.views-admin ul.item-list { margin: 0; padding: 0; }