diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php index f3ba232b09e..6e546433d98 100644 --- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php +++ b/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php @@ -28,7 +28,7 @@ class AssetAggregationAcrossPagesTest extends PerformanceTestBase { $this->assertSame(6, $performance_data->getStylesheetCount()); $this->assertLessThan(125000, $performance_data->getStylesheetBytes()); $this->assertSame(1, $performance_data->getScriptCount()); - $this->assertLessThan(7500, $performance_data->getScriptBytes()); + $this->assertLessThan(12000, $performance_data->getScriptBytes()); } /** diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php index a0a7c558e8a..f58cf5cd84f 100644 --- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php +++ b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php @@ -75,9 +75,9 @@ class OpenTelemetryFrontPagePerformanceTest extends PerformanceTestBase { $this->assertSame(1, $performance_data->getCacheTagIsValidCount()); $this->assertSame(0, $performance_data->getCacheTagInvalidationCount()); $this->assertSame(1, $performance_data->getScriptCount()); - $this->assertLessThan(7500, $performance_data->getScriptBytes()); + $this->assertLessThan(12000, $performance_data->getScriptBytes()); $this->assertSame(2, $performance_data->getStylesheetCount()); - $this->assertLessThan(40400, $performance_data->getStylesheetBytes()); + $this->assertLessThan(42000, $performance_data->getStylesheetBytes()); } /** diff --git a/core/profiles/demo_umami/themes/umami/css/components/layout_builder/layout-builder.css b/core/profiles/demo_umami/themes/umami/css/components/layout_builder/layout-builder.css index a78c7e8568d..754d7d7c0f9 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/layout_builder/layout-builder.css +++ b/core/profiles/demo_umami/themes/umami/css/components/layout_builder/layout-builder.css @@ -3,13 +3,12 @@ * This file is used to style the layout builder. */ -.layout-builder__message--defaults .messages, -.layout-builder__message--overrides .messages { +.layout-builder__message .messages { background-image: none; } .layout-builder__message--defaults .messages__content { - background-image: url("../../../../../../../misc/icons/73b355/globe.svg"); + --umami-message-icon: url("../../../../../../../misc/icons/73b355/globe.svg"); } .layout-builder__message--overrides .messages__content { - background-image: url("../../../../../../../misc/icons/73b355/location.svg"); + --umami-message-icon: url("../../../../../../../misc/icons/73b355/location.svg"); } diff --git a/core/profiles/demo_umami/themes/umami/css/components/messages/messages.css b/core/profiles/demo_umami/themes/umami/css/components/messages/messages.css index c911bde630c..df80f509f0c 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/messages/messages.css +++ b/core/profiles/demo_umami/themes/umami/css/components/messages/messages.css @@ -4,49 +4,39 @@ */ .messages { - margin-bottom: 1em; padding: 20px; word-wrap: break-word; color: inherit; overflow-wrap: break-word; } -[dir="rtl"] .messages { - text-align: right; - background-position: right 10px top 17px; -} -.messages + .messages { - margin-top: 1.538em; -} .messages__content { - padding-left: 24px; /* LTR */ - background: no-repeat 0 center; /* LTR */ + padding-inline-start: 24px; + background-image: var(--umami-message-icon); + background-repeat: no-repeat; + background-position-x: left; + background-position-y: center; } [dir="rtl"] .messages__content { - padding-right: 24px; - padding-left: 0; - background-position: right; + background-position-x: right; } .messages--status { + --umami-message-icon: url(/core/misc/icons/73b355/check.svg); + border: 1px solid #cbdebc; background-color: #e6eee0; } -.messages--status .messages__content { - background-image: url(/core/misc/icons/73b355/check.svg); -} .messages--warning { + --umami-message-icon: url(/core/misc/icons/e29700/warning.svg); + border: 1px solid #fae2a4; background-color: #fcf1d4; } -.messages--warning .messages__content { - background-image: url(/core/misc/icons/e29700/warning.svg); -} .messages--error { + --umami-message-icon: url(/core/misc/icons/e32700/error.svg); + border: 1px solid #f8c8d5; background-color: #f9e6eb; } -.messages--error .messages__content { - background-image: url(/core/misc/icons/e32700/error.svg); -} .messages--error .error { color: inherit; } @@ -61,3 +51,7 @@ .messages__item + .messages__item { margin-top: 0.769em; } +.messages__wrapper { + display: grid; + gap: 1.538em; +} diff --git a/core/profiles/demo_umami/themes/umami/js/components/messages/messages.js b/core/profiles/demo_umami/themes/umami/js/components/messages/messages.js index 6f56fd34542..3df0790cb3c 100644 --- a/core/profiles/demo_umami/themes/umami/js/components/messages/messages.js +++ b/core/profiles/demo_umami/themes/umami/js/components/messages/messages.js @@ -34,7 +34,7 @@ messageWrapper.setAttribute('data-drupal-message-type', type); messageWrapper.innerHTML = ` -
+
diff --git a/core/profiles/demo_umami/themes/umami/templates/components/messages/status-messages.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/messages/status-messages.html.twig index 1400ddd3619..8f2127521b5 100644 --- a/core/profiles/demo_umami/themes/umami/templates/components/messages/status-messages.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/components/messages/status-messages.html.twig @@ -20,19 +20,21 @@ */ #}
-{% block messages %} -{% for type, messages in message_list %} - {% - set classes = [ - 'messages', - 'messages--' ~ type, - ] - %} -
-
- {% if type == 'error' %} -
- {% endif %} +
+ {% block messages %} + {% for type, messages in message_list %} + {% + set classes = [ + 'messages', + 'messages--' ~ type, + ] + %} +
+
{% if status_headings[type] %} {% endif %} @@ -45,13 +47,11 @@ {% else %} {{ messages|first }} {% endif %} - {% if type == 'error' %} -
- {% endif %} +
+ {# Remove type specific classes. #} + {% set attributes = attributes.removeClass(classes) %} + {% endfor %} + {% endblock messages %}
- {# Remove type specific classes. #} - {% set attributes = attributes.removeClass(classes) %} -{% endfor %} -{% endblock messages %}
diff --git a/core/profiles/demo_umami/themes/umami/umami.info.yml b/core/profiles/demo_umami/themes/umami/umami.info.yml index 441ebdaf763..bf1c9ffca67 100644 --- a/core/profiles/demo_umami/themes/umami/umami.info.yml +++ b/core/profiles/demo_umami/themes/umami/umami.info.yml @@ -6,6 +6,7 @@ version: VERSION libraries: - umami/classy.base - core/normalize + - core/drupal.message - umami/global libraries-override: