Merge remote-tracking branch 'origin/MC-41474' into 2.4-develop-pr55

Serhii Balko · Serhii Balko · commit e7c6ebf59ae0 · 2021-03-25T10:22:48.000+02:00
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
@@ -3,18 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var Magento\Framework\View\Element\Template $block
+ */
 ?>
 
-<div id="cookie-status">
+<div class="cookie-status-message" id="cookie-status">
     <?= $block->escapeHtml(__('The store will not work correctly in the case when cookies are disabled.')); ?>
 </div>
-<?php
-$script = 'document.querySelector("#cookie-status").style.display = "none";';
-?>
-<?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false); ?>
-
 <script type="text/x-magento-init">
     {
         "*": {
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less
@@ -285,6 +285,10 @@
             padding: 0;
         }
     }
+
+    .cookie-status-message {
+        display: none;
+    }
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -393,6 +393,10 @@
         border: @tooltip__border-width solid @tooltip__border-color;
         padding: 10px;
     }
+
+    .cookie-status-message {
+        display: none;
+    }
 }
 
 //

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,10 @@`
`285`	`285`	`padding: 0;`
`286`	`286`	`}`
`287`	`287`	`}`
	`288`	`+`
	`289`	`+ .cookie-status-message {`
	`290`	`+ display: none;`
	`291`	`+ }`
`288`	`292`	`}`
`289`	`293`
`290`	`294`	`//`
Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,10 @@`
`393`	`393`	`border: @tooltip__border-width solid @tooltip__border-color;`
`394`	`394`	`padding: 10px;`
`395`	`395`	`}`
	`396`	`+`
	`397`	`+ .cookie-status-message {`
	`398`	`+ display: none;`
	`399`	`+ }`
`396`	`400`	`}`
`397`	`401`
`398`	`402`	`//`