From 00df5bad0243e5d9ca1cecd918d67dc9d36aca1a Mon Sep 17 00:00:00 2001 From: Alex Pott <alex.a.pott@googlemail.com> Date: Tue, 17 Feb 2015 00:19:24 +0000 Subject: [PATCH] Issue #2407743 by mortendk, danquah, rteijeiro, davidhernandez, sivaji@knackforge.com: Remove classes from system templates s*.html.twig --- .../modules/system/src/Tests/Theme/MessageTest.php | 4 ++++ .../system/templates/status-messages.html.twig | 14 +++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/core/modules/system/src/Tests/Theme/MessageTest.php b/core/modules/system/src/Tests/Theme/MessageTest.php index 451ec9ab55b5..3e8da82744ae 100644 --- a/core/modules/system/src/Tests/Theme/MessageTest.php +++ b/core/modules/system/src/Tests/Theme/MessageTest.php @@ -25,6 +25,10 @@ class MessageTest extends KernelTestBase { * Tests setting messages output. */ function testMessages() { + // Enable the Classy theme. + \Drupal::service('theme_handler')->install(['classy']); + $this->config('system.theme')->set('default', 'classy')->save(); + drupal_set_message('An error occurred', 'error'); drupal_set_message('But then something nice happened'); $messages = array( diff --git a/core/modules/system/templates/status-messages.html.twig b/core/modules/system/templates/status-messages.html.twig index a2f36311ff84..59947e58de1d 100644 --- a/core/modules/system/templates/status-messages.html.twig +++ b/core/modules/system/templates/status-messages.html.twig @@ -26,13 +26,7 @@ */ #} {% for type, messages in message_list %} - {% - set classes = [ - 'messages', - 'messages--' ~ type, - ] - %} - <div class="{{ attributes.addClass(classes).class }}" role="contentinfo" aria-label="{{ status_headings[type] }}"> + <div class="{{ attributes.class }}" role="contentinfo" aria-label="{{ status_headings[type] }}"> {% if type == 'error' %} <div role="alert"> {% endif %} @@ -40,9 +34,9 @@ <h2 class="visually-hidden">{{ status_headings[type] }}</h2> {% endif %} {% if messages|length > 1 %} - <ul class="messages__list"> + <ul> {% for message in messages %} - <li class="messages__item">{{ message }}</li> + <li>{{ message }}</li> {% endfor %} </ul> {% else %} @@ -52,6 +46,4 @@ </div> {% endif %} </div> - {# Remove type specific classes. #} - {{ attributes.removeClass(classes) }} {% endfor %} -- GitLab