Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8074877

Browse files
jeff-matthewsanandhan-ziffityabrarpathan19rodrigowebjumprogyar
authored
Small changes (magento#6320)
* Add missing command in cache clean * Update product-layouts.md * Update product-layouts.md * Fix the inheritance of alert widget * Fix standalone example 2 * Fix code example adding validation to form * Update product-layouts.md * Update using-fonts.md * Update src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md Co-Authored-By: Yaroslav Rogoza <[email protected]> * Update src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md Co-Authored-By: Yaroslav Rogoza <[email protected]> * Update src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md Co-Authored-By: Yaroslav Rogoza <[email protected]> * Update css-preprocess.md * Recent changes require the config.php file to exist before running the docker:build command for customizations to be effective * Minor adjustments * magento/devdocs#: Add link to “Applying patches > Custom patches” from “Apply custom patches” https://devdocs.magento.com/cloud/project/project-patch.html * Fix typo Fix typo * Update src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md Co-Authored-By: Jeff Matthews <[email protected]> * Update src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md Co-Authored-By: Jeff Matthews <[email protected]> * Update src/guides/v2.3/frontend-dev-guide/layouts/product-layouts.md Co-Authored-By: Jeff Matthews <[email protected]> * Fix typo Fix typo * Fixed linting errors * Fixed link syntax Co-authored-by: anandhan-ziffity <[email protected]> Co-authored-by: Abrar Pathan <[email protected]> Co-authored-by: Rodrigo Mourão <[email protected]> Co-authored-by: Yaroslav Rogoza <[email protected]> Co-authored-by: Joe Shelton <[email protected]> Co-authored-by: Alexander Taranovsky <[email protected]> Co-authored-by: Vladyslav Sikailo <[email protected]> Co-authored-by: Donald Booth <[email protected]>
1 parent 81586c7 commit 8074877

File tree

10 files changed

+31
-14
lines changed

10 files changed

+31
-14
lines changed

‎src/cloud/cdn/configure-fastly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ For more information, see the Magento 2 [Backend settings guide](https://github.
184184

185185
### Configure purge options {#purge}
186186

187-
Fastly provides multiple types of purge options on your Magento Cache Management page including purging product category, product assets, and content. When enabled, Fastly watches for events to automatically purge those caches. If you disable a purge option, you can manually purge Fastly aches after finishing updates through the Cache Management page.
187+
Fastly provides multiple types of purge options on your Magento Cache Management page including purging product category, product assets, and content. When enabled, Fastly watches for events to automatically purge those caches. If you disable a purge option, you can manually purge Fastly caches after finishing updates through the Cache Management page.
188188

189189
The options include:
190190

‎src/cloud/docker/docker-config.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,16 @@ For example, the following command starts the Docker configuration generator for
107107

108108
Continue launching your Docker environment in the default _production_ mode.
109109

110-
1. In your local environment, start the Docker configuration generator. You can use the service keys, such as `--php`, to [specify a version](#service-versions).
110+
1. _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
111111

112112
```bash
113-
./vendor/bin/ece-tools docker:build
113+
cp ./docker/config.php.dist ./docker/config.php
114114
```
115115

116-
1. _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
116+
1. In your local environment, start the Docker configuration generator. You can use the service keys, such as `--php`, to [specify a version](#service-versions).
117117

118118
```bash
119-
cp ./docker/config.php.dist ./docker/config.php
119+
./vendor/bin/ece-tools docker:build
120120
```
121121

122122
1. _Optional_: Configure the Docker global variables in the `docker-compose.yml` file. For example, you can [configure Xdebug]({{ site.baseurl }}/cloud/docker/docker-development-debug.html#configure-xdebug).
@@ -179,6 +179,12 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
179179

180180
If you have it installed, continue to the next step.
181181

182+
1. _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
183+
184+
```bash
185+
cp ./docker/config.php.dist ./docker/config.php
186+
```
187+
182188
1. In your local environment, start the Docker configuration generator. You can use the service keys, such as `--php`, to [specify a version](#service-versions).
183189

184190
```bash

‎src/cloud/project/project-patch.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ functional_areas:
55
- Cloud
66
- Upgrade
77
---
8-
Sometimes we provide a custom patch to address a specific issue. Also, third-party extension developers can provide a custom patch. Copy the custom patch to the `/m2-hotfixes` directory and test it on your local workstation.
8+
9+
Sometimes we provide a [custom patch]({{ site.baseurl }}/guides/v2.3/comp-mgr/patching.html#custom-patches) to address a specific issue. Also, third-party extension developers can provide a custom patch. Copy the custom patch to the `/m2-hotfixes` directory and test it on your local workstation.
910

1011
{% include cloud/note-upgrade.md %}
1112

‎src/cloud/project/project-upgrade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ We also recommend upgrading to the latest version of the Fastly CDN module for M
201201

202202
## Troubleshoot upgrade
203203

204-
If the upgrade failed, you receive an error message in the browser indicating that you cannot access your storefront or the Magento Admin pane:
204+
If the upgrade failed, you receive an error message in the browser indicating that you cannot access your storefront or the Magento Admin panel:
205205

206206
```terminal
207207
There has been an error processing your request
@@ -220,4 +220,4 @@ To resolve the error:
220220

221221
```bash
222222
git add -A && git commit -m "Fixed deployment failure" && git push magento <branch-name>
223-
```
223+
```

‎src/guides/v2.3/frontend-dev-guide/cache_for_frontdevs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The full list of cache types can be found in the [Overview of cache types]({{ pa
2626
To clean cache, run
2727

2828
```bash
29-
magento cache:clean <type> ... <type>
29+
bin/magento cache:clean <type> ... <type>
3030
```
3131

3232
To view the status of the cache, run:

‎src/guides/v2.3/frontend-dev-guide/css-topics/css-preprocess.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The client-side compilation flow is similar to [server-side](#server-side). The
134134

135135
- root source (.less) files with resolved `@magento_import` directive
136136
- [symlinks](http://en.wikipedia.org/wiki/Symbolic_link) to the root source file that do not contain `@magento_import`
137-
- symlinks to all other \`.less\` files imported recursively by the `@magento_import` and `@import` directives
137+
- symlinks to all other `.less` files imported recursively by the `@magento_import` and `@import` directives
138138

139139
{:.bs-callout-info}
140140
Symlink is not created, and a copy of the processed file is published to `pub/static` instead, if the source file differs from the processed one. One of the reasons of this difference might be the usage of the `@import` directive without file extension in the source file. See [The @import directive usage](#fedg_css-import) for more details.

‎src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,13 @@ For Example:
7676

7777
See the [magento2-ui-library](https://magento-devdocs.github.io/magento2-ui-library/icons.html) for an icon list and implementation.
7878

79-
To customize a font you import, consider using [IcoMoon](https://icomoon.io/app/).
79+
To customize a font you import, consider using [IcoMoon](https://icomoon.io/app/). To override Luma or Blank theme icon fonts, change the font path in the `_theme.less` file. For example:
80+
81+
```css
82+
// Fonts
83+
@icons__font-path: '@{baseDir}fonts/Theme-Icons'; // Add you fonts in your-theme/web/fonts
84+
@icons__font-name: 'Theme-Icons';
85+
```
8086

8187
{:.bs-callout-info}
8288
If your theme does not use the Magento UI library, include the font in your theme's CSS files using the `@font-face` CSS rule.

‎src/guides/v2.3/frontend-dev-guide/layouts/product-layouts.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ Layout file | Description
4242
`wishlist_index_configure_type_downloadable.xml` | Layout from this file is applied to `downloadable` product only
4343
`wishlist_index_configure_type_grouped.xml` | Layout from this file is applied to `grouped` product only
4444
`wishlist_index_configure_type_simple.xml` | Layout from this file is applied to `simple` product only
45+
46+
For setting a custom layout on specific category, product, and CMS pages, see [Common layout customization tasks]({{ page.baseurl }}/frontend-dev-guide/layouts/xml-manage.html#create-cms-pageproductcategory-specific-layouts).

‎src/guides/v2.3/javascript-dev-guide/widgets/widget_alert.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ subgroup: 3_Widgets
44
title: Alert widget
55
---
66

7-
The Magento alert widget implements a modal pop-up window with a confirmation button. It extends the [Magento modal widget].
7+
The Magento alert widget implements a modal pop-up window with a confirmation button. It extends the [Magento confirmation widget] which in turn extends the [Magento modal widget].
88

99
The alert widget source is [`<Magento_Ui_module_dir>/view/base/web/js/modal/alert.js`].
1010

@@ -31,7 +31,8 @@ $('#init_element').alert({
3131
```javascript
3232
require([
3333
'Magento_Ui/js/modal/alert'
34-
], function(alert) { // Variable that represents the `alert` function
34+
'jquery'
35+
], function(alert, $) { // Variable that represents the `alert` function
3536

3637
alert({
3738
title: $.mage.__('Some title'),
@@ -249,6 +250,7 @@ require([
249250

250251
![Alert Widget]({{ site.baseurl }}/common/images/widget/alert-widget-result.png)
251252

253+
[Magento confirmation widget]: {{ page.baseurl }}/javascript-dev-guide/widgets/widget_confirm.html
252254
[Magento modal widget]: {{ page.baseurl }}/javascript-dev-guide/widgets/widget_modal.html
253255
[`<Magento_Ui_module_dir>/view/base/web/js/modal/alert.js`]: {{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Ui/view/base/web/js/modal/alert.js
254256
[Magento Admin Pattern Library, the Slide-out Panels, Modal Windows, and Overlays topic.]: {{ page.baseurl }}/pattern-library/containers/slideouts-modals-overlays/slideouts-modals-overalys.html#modals

‎src/guides/v2.3/javascript-dev-guide/widgets/widget_password_strength_indicator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The password strength indicator widget listens for `change`, `keyup`, and `paste
112112
The following example shows how to initialize the password strength indicator widget and pass options during the initialization.
113113

114114
```html
115-
<form action="BACKEND_ACTION" method="post">
115+
<form action="BACKEND_ACTION" method="post" data-mage-init='{"validation":{}}'>
116116
<fieldset class="fieldset">
117117
<div class="field password required" data-mage-init='{"passwordStrengthIndicator": {
118118
"passwordStrengthMeterSelector":"[data-role=strength-meter]",

0 commit comments

Comments
 (0)