Skip to content

Commit e870b63

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-37118' into PR
2 parents fe068b5 + 5e8d791 commit e870b63

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="actions">
88
<button
99
<?php $block->getUiId(); ?>
10-
class="action-login action-primary"
10+
class="action-login action-primary">
1111
<span><?php echo __('Sign in')?></span>
1212
</button>
1313
</div>

app/code/Magento/Shipping/view/frontend/templates/items.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<a href="<?php echo $block->getPrintShipmentUrl($_shipment) ?>"
2626
onclick="this.target='_blank'"
2727
class="action print">
28-
<span><?php echo __('Print Shipment') ?></span
28+
<span><?php echo __('Print Shipment') ?></span>
2929
</a>
3030
<a href="#"
3131
data-mage-init='{"popupWindow": {"windowURL":"<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'

dev/tests/js/jasmine/assets/apply/templates/node.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
*/
66
-->
77
<div id="<%= containerId %>">
8-
<div id="<%= nodeId %>">
8+
<div id="<%= nodeId %>"
99
<%= dataAttr %>='<%= JSON.stringify(nodeData) %>'></div>
1010
</div>

0 commit comments

Comments
 (0)