Skip to content

Commit

Permalink
Merge pull request #529 from magento-frontend/MAGETWO-59818
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
slavvka authored Oct 25, 2016
2 parents 5950439 + 03b7994 commit f6d1b99
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,53 +28,6 @@
</block>
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="Magento_Catalog::product/list/toolbar.phtml">
<block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager"/>
<!-- The following code shows how to set your own pager increments -->
<!--
<action method="setDefaultListPerPage">
<argument name="limit" xsi:type="string">4</argument>
</action>
<action method="setDefaultGridPerPage">
<argument name="limit" xsi:type="string">3</argument>
</action>
<action method="addPagerLimit">
<argument name="mode" xsi:type="string">list</argument>
<argument name="limit" xsi:type="string">2</argument>
</action>
<action method="addPagerLimit">
<argument name="mode" xsi:type="string">list</argument>
<argument name="limit" xsi:type="string">4</argument>
</action>
<action method="addPagerLimit">
<argument name="mode" xsi:type="string">list</argument>
<argument name="limit" xsi:type="string">6</argument>
</action>
<action method="addPagerLimit">
<argument name="mode" xsi:type="string">list</argument>
<argument name="limit" xsi:type="string">8</argument>
</action>
<action method="addPagerLimit" translate="label">
<argument name="mode" xsi:type="string">list</argument>
<argument name="limit" xsi:type="string">all</argument>
<argument name="label" xsi:type="string">All</argument>
</action>
<action method="addPagerLimit">
<argument name="mode" xsi:type="string">grid</argument>
<argument name="limit" xsi:type="string">3</argument>
</action>
<action method="addPagerLimit">
<argument name="mode" xsi:type="string">grid</argument>
<argument name="limit" xsi:type="string">6</argument>
</action>
<action method="addPagerLimit">
<argument name="mode" xsi:type="string">grid</argument>
<argument name="limit" xsi:type="string">9</argument>
</action>
<action method="addPagerLimit" translate="label">
<argument name="mode" xsi:type="string">grid</argument>
<argument name="limit" xsi:type="string">all</argument>
<argument name="label" xsi:type="string">All</argument>
</action>
-->
</block>
<action method="setToolbarBlockName">
<argument name="name" xsi:type="string">product_list_toolbar</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<!-- ko foreach: getRegion('additional-login-form-fields') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
</div>
<div class="actions-toolbar">
<input name="context" type="hidden" value="checkout" />
<div class="primary">
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/view/frontend/templates/form.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<?php if ($block->getRatings() && $block->getRatings()->getSize()): ?>
<span id="input-message-box"></span>
<fieldset class="field required review-field-ratings">
<legend class="label"><span><?php echo $block->escapeHtml(__('Your Rating')) ?><span></legend><br/>
<legend class="label"><span><?php echo $block->escapeHtml(__('Your Rating')) ?></span></legend><br/>
<div class="control">
<div class="nested" id="product-review-table">
<?php foreach ($block->getRatings() as $_rating): ?>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Overview
## Purpose of module

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

# Deployment
## System requirements
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/blank/etc/view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
</var>
<var name="options">
<var name="options">
<var name="navigation">dots</var>
<var name="nav">dots</var>
</var>
</var>
</var>
Expand Down

0 comments on commit f6d1b99

Please sign in to comment.