Skip to content

Commit 0df0711

Browse files
Merge remote-tracking branch '39164/accesibility-improvements' into comprv1
2 parents 4016f8a + 1d66940 commit 0df0711

File tree

2 files changed

+16
-15
lines changed
  • app
    • code/Magento/Theme/view/frontend/templates/html
    • design/frontend/Magento/blank/Magento_Swatches/web/css/source

2 files changed

+16
-15
lines changed

app/code/Magento/Theme/view/frontend/templates/html/sections.phtml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* General template for displaying group of blocks divided into sections
99
*/
10+
/** @var \Magento\Framework\Escaper $escaper */
1011

1112
$group = $block->getGroupName();
1213
$groupCss = $block->getGroupCss();
1314
?>
1415
<?php if ($detailedInfoGroup = $block->getGroupChildNames($group)):?>
15-
<div class="sections <?= $block->escapeHtmlAttr($groupCss) ?>">
16+
<div class="sections <?= $escaper->escapeHtmlAttr($groupCss) ?>">
1617
<?php $layout = $block->getLayout(); ?>
17-
<div class="section-items <?= $block->escapeHtmlAttr($groupCss) ?>-items"
18+
<div class="section-items <?= $escaper->escapeHtmlAttr($groupCss) ?>-items"
1819
data-mage-init='{"tabs":{"openedState":"active"}}'>
1920
<?php foreach ($detailedInfoGroup as $name):?>
2021
<?php
@@ -25,16 +26,16 @@ $groupCss = $block->getGroupCss();
2526
$alias = $layout->getElementAlias($name);
2627
$label = $block->getChildData($alias, 'title');
2728
?>
28-
<div class="section-item-title <?= $block->escapeHtmlAttr($groupCss) ?>-item-title"
29+
<div class="section-item-title <?= $escaper->escapeHtmlAttr($groupCss) ?>-item-title"
2930
data-role="collapsible">
30-
<a class="<?= $block->escapeHtmlAttr($groupCss) ?>-item-switch"
31-
data-toggle="switch" href="#<?= $block->escapeHtmlAttr($alias) ?>">
31+
<a class="<?= $escaper->escapeHtmlAttr($groupCss) ?>-item-switch"
32+
data-toggle="switch" href="#<?= $escaper->escapeHtmlAttr($alias) ?>">
3233
<?= /* @noEscape */ $label ?>
3334
</a>
3435
</div>
35-
<div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content"
36-
id="<?= $block->escapeHtmlAttr($alias) ?>"
37-
data-role="content">
36+
<div class="section-item-content <?= $escaper->escapeHtmlAttr($groupCss) ?>-item-content"
37+
id="<?= $escaper->escapeHtmlAttr($alias) ?>"
38+
role="tab">
3839
<?= /* @noEscape */ $html ?>
3940
</div>
4041
<?php endforeach;?>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// /**
2-
// * Copyright © Magento, Inc. All rights reserved.
3-
// * See COPYING.txt for license details.
2+
// * Copyright 2017 Adobe
3+
// * All Rights Reserved.
44
// */
55

66
//
@@ -34,7 +34,7 @@
3434

3535
// Size and Manufacturer attributes
3636
@attr-swatch-option__background: @swatch-option__background;
37-
@attr-swatch-option__color: #949494;
37+
@attr-swatch-option__color: #474747;
3838

3939
@attr-swatch-option__selected__background: @color-white;
4040
@attr-swatch-option__selected__border: @border-width__base solid @color-white;
@@ -47,7 +47,7 @@
4747
// Tooltip
4848
@swatch-option-tooltip__background: @color-white;
4949
@swatch-option-tooltip__border: @swatch-option__border;
50-
@swatch-option-tooltip__color: #949494;
50+
@swatch-option-tooltip__color: #474747;
5151

5252
@swatch-option-tooltip-title__color: #282828;
5353

@@ -184,7 +184,7 @@
184184
pointer-events: none;
185185

186186
&:after {
187-
// ToDo: improve .lib-background-gradient() to support diagonal gradient
187+
// ToDo: improve .lib-background-gradient() to support diagonal gradient;
188188
background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
189189
background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
190190
background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);

0 commit comments

Comments
 (0)