Skip to content

Commit 45ebf7c

Browse files
committed
Merge branch '2.1-develop' of github.com:magento/magento2ce into MPI-PR-2.1.10
2 parents b1f9109 + 426e4c1 commit 45ebf7c

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<argument name="at_call" xsi:type="string">getDescription</argument>
110110
<argument name="at_code" xsi:type="string">description</argument>
111111
<argument name="css_class" xsi:type="string">description</argument>
112-
<argument name="at_label" xsi:type="string">none</argument>
112+
<argument name="at_label" translate="true" xsi:type="string">none</argument>
113113
<argument name="title" translate="true" xsi:type="string">Details</argument>
114114
</arguments>
115115
</block>

app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if ($_attributeType && $_attributeType == 'text') {
3434

3535
<?php if ($_attributeValue): ?>
3636
<div class="product attribute <?php /* @escapeNotVerified */ echo $_className?>">
37-
<?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong><?php endif; ?>
37+
<?php if ($_attributeLabel != __('none')): ?><strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong><?php endif; ?>
3838
<div class="value" <?php /* @escapeNotVerified */ echo $_attributeAddAttribute;?>><?php /* @escapeNotVerified */ echo $_attributeValue; ?></div>
3939
</div>
4040
<?php endif; ?>

app/design/frontend/Magento/blank/web/css/source/_layout.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
.lib-vendor-prefix-flex-basis(100%);
2222
.lib-vendor-prefix-flex-grow(1);
2323
.lib-vendor-prefix-order(1);
24+
width: 100%;
2425
}
2526

2627
.sidebar-main {

0 commit comments

Comments
 (0)