Skip to content

Commit f6d1b99

Browse files
authored
Merge pull request #529 from magento-frontend/MAGETWO-59818
[Frontend] MAGETWO-59818 Process public PRs - MAGETWO-59867 [GITHUB ] Fixed layout for customer authentication popup #6280 - MAGETWO-59868 [GITHUB] Remove obsolete comment in catalog_category_view.xml #6549 - MAGETWO-59869 [GITHUB] Fixed unclosed span tag in Review module #6801 - MAGETWO-59823 [Github #6804] Gallery navigation is broken on mobile in Blank theme - MAGETWO-59866 [GITHUB] Update README.md #6009
2 parents 5950439 + 03b7994 commit f6d1b99

File tree

5 files changed

+3
-51
lines changed

5 files changed

+3
-51
lines changed

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

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -28,53 +28,6 @@
2828
</block>
2929
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="Magento_Catalog::product/list/toolbar.phtml">
3030
<block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager"/>
31-
<!-- The following code shows how to set your own pager increments -->
32-
<!--
33-
<action method="setDefaultListPerPage">
34-
<argument name="limit" xsi:type="string">4</argument>
35-
</action>
36-
<action method="setDefaultGridPerPage">
37-
<argument name="limit" xsi:type="string">3</argument>
38-
</action>
39-
<action method="addPagerLimit">
40-
<argument name="mode" xsi:type="string">list</argument>
41-
<argument name="limit" xsi:type="string">2</argument>
42-
</action>
43-
<action method="addPagerLimit">
44-
<argument name="mode" xsi:type="string">list</argument>
45-
<argument name="limit" xsi:type="string">4</argument>
46-
</action>
47-
<action method="addPagerLimit">
48-
<argument name="mode" xsi:type="string">list</argument>
49-
<argument name="limit" xsi:type="string">6</argument>
50-
</action>
51-
<action method="addPagerLimit">
52-
<argument name="mode" xsi:type="string">list</argument>
53-
<argument name="limit" xsi:type="string">8</argument>
54-
</action>
55-
<action method="addPagerLimit" translate="label">
56-
<argument name="mode" xsi:type="string">list</argument>
57-
<argument name="limit" xsi:type="string">all</argument>
58-
<argument name="label" xsi:type="string">All</argument>
59-
</action>
60-
<action method="addPagerLimit">
61-
<argument name="mode" xsi:type="string">grid</argument>
62-
<argument name="limit" xsi:type="string">3</argument>
63-
</action>
64-
<action method="addPagerLimit">
65-
<argument name="mode" xsi:type="string">grid</argument>
66-
<argument name="limit" xsi:type="string">6</argument>
67-
</action>
68-
<action method="addPagerLimit">
69-
<argument name="mode" xsi:type="string">grid</argument>
70-
<argument name="limit" xsi:type="string">9</argument>
71-
</action>
72-
<action method="addPagerLimit" translate="label">
73-
<argument name="mode" xsi:type="string">grid</argument>
74-
<argument name="limit" xsi:type="string">all</argument>
75-
<argument name="label" xsi:type="string">All</argument>
76-
</action>
77-
-->
7831
</block>
7932
<action method="setToolbarBlockName">
8033
<argument name="name" xsi:type="string">product_list_toolbar</argument>

app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
<!-- ko foreach: getRegion('additional-login-form-fields') -->
7979
<!-- ko template: getTemplate() --><!-- /ko -->
8080
<!-- /ko -->
81-
</div>
8281
<div class="actions-toolbar">
8382
<input name="context" type="hidden" value="checkout" />
8483
<div class="primary">

app/code/Magento/Review/view/frontend/templates/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<?php if ($block->getRatings() && $block->getRatings()->getSize()): ?>
2121
<span id="input-message-box"></span>
2222
<fieldset class="field required review-field-ratings">
23-
<legend class="label"><span><?php echo $block->escapeHtml(__('Your Rating')) ?><span></legend><br/>
23+
<legend class="label"><span><?php echo $block->escapeHtml(__('Your Rating')) ?></span></legend><br/>
2424
<div class="control">
2525
<div class="nested" id="product-review-table">
2626
<?php foreach ($block->getRatings() as $_rating): ?>

app/code/Magento/Ui/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Overview
22
## Purpose of module
33

4-
The Magento\Ui module introduces a set of common UI components, which could be easily used and configured via layout XML files.
4+
The Magento\Ui module introduces a set of common UI components, which could be used and configured via layout XML files.
55

66
# Deployment
77
## System requirements

app/design/frontend/Magento/blank/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
</var>
228228
<var name="options">
229229
<var name="options">
230-
<var name="navigation">dots</var>
230+
<var name="nav">dots</var>
231231
</var>
232232
</var>
233233
</var>

0 commit comments

Comments
 (0)