Skip to content

Commit bd4ba4c

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-43871' into PR-2
2 parents 382738e + 6e203b8 commit bd4ba4c

File tree

2 files changed

+0
-48
lines changed
  • app
    • code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps
    • design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps

2 files changed

+0
-48
lines changed

app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -225,14 +225,6 @@
225225
</div>
226226
</fieldset>
227227
</div>
228-
229-
<button type="button"
230-
class="action-close"
231-
data-role="close-panel"
232-
title="<?= $block->escapeHtml(__('Close panel')) ?>">
233-
<span><?= /* @escapeNotVerified */ __('Close panel') ?></span>
234-
</button>
235-
<div class="image-pointer"></div>
236228
</div>
237229
</script>
238230

@@ -441,14 +433,6 @@
441433
</div>
442434
</fieldset>
443435
</div>
444-
445-
<button type="button"
446-
class="action-close"
447-
data-role="close-panel"
448-
title="<?= $block->escapeHtml(__('Close panel')) ?>">
449-
<span><?= /* @escapeNotVerified */ __('Close panel') ?></span>
450-
</button>
451-
<div class="image-pointer"></div>
452436
</div>
453437
</script>
454438

app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -361,16 +361,6 @@
361361
top: 5px;
362362
}
363363

364-
.image-pointer {
365-
background: url(../Magento_Backend/images/gallery-image-panel-corner.png) no-repeat;
366-
height: 15px;
367-
left: 50%;
368-
margin-left: -14px;
369-
position: absolute;
370-
top: -11px;
371-
width: 28px;
372-
}
373-
374364
.image-panel-controls,
375365
.image-panel-preview {
376366
float: left;
@@ -431,28 +421,6 @@
431421
width: 100%;
432422
}
433423

434-
.image-panel {
435-
.action-close {
436-
padding: 0;
437-
position: absolute;
438-
right: 29px;
439-
top: 17px;
440-
.lib-icon-font(
441-
@_icon-font-content: @icon-close-mage__content,
442-
@_icon-font: @icons-admin__font-name,
443-
@_icon-font-size: 2rem,
444-
@_icon-font-color: @color-brownie-vanilla,
445-
@_icon-font-color-hover: @color-brownie-vanilla
446-
);
447-
span {
448-
&:extend(.abs-visually-hidden all);
449-
}
450-
&:active {
451-
padding: 0;
452-
}
453-
}
454-
}
455-
456424
//
457425
// Custom Multiselect
458426
// _____________________________________________

0 commit comments

Comments
 (0)