Skip to content

Commit a102409

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop expedited
Accepted Community Pull Requests: - #23524: remove html tag from option html from order page (by @sunilit42) - #22717: Getting 404 url while updating quantity on multiple address cart page (by @vikalps4) - #23166: Fix 22085 (by @geet07) Fixed GitHub Issues: - #23510: Product customizable options of Area type render issue in Dashboard (reported by @shinoamakusa) has been fixed in #23524 by @sunilit42 in 2.3-develop branch Related commits: 1. 439831f
2 parents c9338ad + b2bb694 commit a102409

File tree

3 files changed

+8
-4
lines changed
  • app
    • code/Magento
    • design/frontend/Magento/blank/Magento_Swatches/web/css/source

3 files changed

+8
-4
lines changed

app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
data-mage-init='{
1919
"multiShipping":{},
2020
"cartUpdate": {
21-
"validationURL": "/multishipping/checkout/checkItems",
21+
"validationURL": "<?= $block->escapeUrl($block->getUrl('multishipping/checkout/checkItems')) ?>",
2222
"eventName": "updateMulticartItemQty"
2323
}}'
2424
action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"

app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
<?php else : ?>
2929
<?php $_option = $block->getFormattedOption($_option['value']); ?>
3030
<?php $dots = 'dots' . uniqid(); ?>
31-
<?= $block->escapeHtml($_option['value']) ?><?php if (isset($_option['remainder']) && $_option['remainder']) : ?> <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
31+
<?= $block->escapeHtml($_option['value'], ['a']) ?><?php if (isset($_option['remainder']) && $_option['remainder']) : ?> <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
3232
<?php $id = 'id' . uniqid(); ?>
33-
<span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder']) ?></span>
33+
<span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder'], ['a']) ?></span>
3434
<script>
3535
require(['prototype'], function() {
3636
$('<?= /* @noEscape */ $id; ?>').hide();

app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
@swatch-option__hover__color: @color-gray20;
1717
@swatch-option__hover__outline: 1px solid @color-gray60;
1818

19+
@swatch-more__hover__border: @border-width__base solid @color-white;
20+
@swatch-more__hover__color: @color-orange-red1;
21+
@swatch-more__hover__outline: 1px solid @color-gray60;
22+
1923
@swatch-option__selected__border: @swatch-option__hover__border;
2024
@swatch-option__selected__color: @swatch-option__hover__color;
2125
@swatch-option__selected__outline: 2px solid @active__color;
@@ -318,8 +322,8 @@
318322
&-more {
319323
display: inline-block;
320324
margin: 2px 0;
325+
padding: 2px;
321326
position: static;
322-
text-decoration: none !important;
323327
z-index: 1;
324328
}
325329

0 commit comments

Comments
 (0)