Skip to content

Commit 1a58020

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #15105: [Backport] "Add Block Names to Hints" config setting to represent what it actually does (by @sergiy-v) - #15109: [Backport] Fixed typos in .less files (by @sergiy-v) - #15108: [Backport] Fix typo in less button definition (by @sergiy-v) - #15093: [Backport] Changed return type of addToCartPostParams to array (by @rogyar) - #15099: [Backport] Removed extra spaces from language file (by @sergiy-v)
2 parents ed4b97e + 70ded93 commit 1a58020

File tree

8 files changed

+11
-15
lines changed

8 files changed

+11
-15
lines changed

app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
117117
</field>
118118
<field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
119-
<label>Add Block Names to Hints</label>
119+
<label>Add Block Class Type to Hints</label>
120120
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
121121
</field>
122122
</group>

app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ Developer,Developer
324324
Debug,Debug
325325
"Enabled Template Path Hints for Storefront","Enabled Template Path Hints for Storefront"
326326
"Enabled Template Path Hints for Admin","Enabled Template Path Hints for Admin"
327-
"Add Block Names to Hints","Add Block Names to Hints"
327+
"Add Block Class Type to Hints","Add Block Class Type to Hints"
328328
"Template Settings","Template Settings"
329329
"Allow Symlinks","Allow Symlinks"
330330
"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."

app/code/Magento/Catalog/Block/Product/ListProduct.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ public function getIdentities()
340340
* Get post parameters
341341
*
342342
* @param \Magento\Catalog\Model\Product $product
343-
* @return string
343+
* @return array
344344
*/
345345
public function getAddToCartPostParams(\Magento\Catalog\Model\Product $product)
346346
{

app/code/Magento/CatalogInventory/i18n/en_US.csv

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ Inventory,Inventory
4848
"Only X left Threshold","Only X left Threshold"
4949
"Display Products Availability in Stock on Storefront","Display Products Availability in Stock on Storefront"
5050
"Product Stock Options","Product Stock Options"
51-
"
52-
Please note that these settings apply to individual items in the cart, not to the entire cart.
53-
","
54-
Please note that these settings apply to individual items in the cart, not to the entire cart.
55-
"
51+
"Please note that these settings apply to individual items in the cart, not to the entire cart.","Please note that these settings apply to individual items in the cart, not to the entire cart."
5652
"Manage Stock","Manage Stock"
5753
Backorders,Backorders
5854
"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"

lib/web/css/docs/source/_buttons.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ button {
397397

398398
// # Button with an icon on the left or right side of the text
399399
//
400-
// <code>@_button-icon-font-position</code> variable is used to set up the icon postiton
400+
// <code>@_button-icon-font-position</code> variable is used to set up the icon position
401401
//
402402
// Use <code>before</code> to set up button icon position on the left:
403403
// ```css
@@ -818,7 +818,7 @@ button {
818818

819819
// # Link as a button
820820
//
821-
// The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate paremeters.
821+
// The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate parameters.
822822
//
823823
// ```html
824824
// <a href="#" class="example-button-9"><span>Button</span></a>

lib/web/css/docs/source/_layout.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ footer.footer {
9191
// <th>@gutter-width</th>
9292
// <td class="vars_value">0</td>
9393
// <td class="vars_value">'' | false | value</td>
94-
// <td>Distanse between columns</td>
94+
// <td>Distance between columns</td>
9595
// </tr>
9696
// <tr>
9797
// <th colspan="4" class="vars_section">Variables for layout columns</th>
@@ -361,7 +361,7 @@ footer.footer {
361361

362362
// # Layout width
363363
//
364-
// The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applyed to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
364+
// The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applied to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
365365

366366
// # Layout width variables
367367
//

lib/web/css/docs/source/_typography.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
// # Typogrphy
6+
// # Typography
77
//
88
// Magento UI library provides mixins for typography styling. To configure typography, global variables from **_variables.less** file are used.
99
//
@@ -979,7 +979,7 @@
979979

980980
// # Text hide
981981
//
982-
// The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applyed to.
982+
// The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applied to.
983983
//
984984
// ```html
985985
// <p class="example-text-hide">

lib/web/css/source/lib/_buttons.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// _____________________________________________
99

1010
//
11-
// Button with solid or pictire background
11+
// Button with solid or picture background
1212
// ---------------------------------------------
1313

1414
.lib-button(

0 commit comments

Comments
 (0)