Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 4db3644

Browse files
authored
Merge branch 'master' into dobooth-patch-2
2 parents 5d720be + 140a241 commit 4db3644

File tree

6 files changed

+48
-3
lines changed

6 files changed

+48
-3
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: 1f85087df1b9be13ca98993aa433cae36c9d0059
3+
revision: c96131acc7a0ed03629ab3401c8a64d819e7e610
44
specs:
5-
devdocs (11)
5+
devdocs (12)
66
jekyll (>= 4.0)
77

88
GEM
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{%- if page.guide_version == nil -%}
2+
{%- assign search_version = site.version -%}
3+
{% else %}
4+
{%- assign search_version = page.guide_version -%}
5+
{%- endif -%}
6+
7+
<form
8+
class="spectrum-Search search-form"
9+
action="{{ site.baseurl }}/guides/v{{ search_version }}/search.html"
10+
>
11+
<input
12+
type="search"
13+
placeholder="Looking for something specific?"
14+
name="query"
15+
value=""
16+
class="spectrum-Textfield-input spectrum-Search-input search-field form-control"
17+
autocomplete="off"
18+
/>
19+
<svg
20+
class="spectrum-Icon spectrum-UIIcon-Magnifier spectrum-Search-icon"
21+
focusable="false"
22+
aria-hidden="true"
23+
>
24+
<rect fill="#ff13dc" opacity="0" width="18" height="18" /><path class="a" d="M16.5865,15.107,12.7,11.2215A6.413,6.413,0,1,0,11.2215,12.7l3.886,3.886a1.05,1.05,0,0,0,1.479-1.479ZM3,7.5A4.5,4.5,0,1,1,7.5,12,4.5,4.5,0,0,1,3,7.5Z" />
25+
</svg>
26+
<button type="reset" class="search-clear spectrum-ClearButton spectrum-SearchClearButton">
27+
<svg
28+
class="spectrum-Icon spectrum-UIIcon-CrossSmall"
29+
focusable="false"
30+
aria-hidden="true"
31+
>
32+
<rect fill="#ff13dc" opacity="0" width="18" height="18" /><path class="a" d="M13.2425,3.343,9,7.586,4.7575,3.343a.5.5,0,0,0-.707,0L3.343,4.05a.5.5,0,0,0,0,.707L7.586,9,3.343,13.2425a.5.5,0,0,0,0,.707l.707.7075a.5.5,0,0,0,.707,0L9,10.414l4.2425,4.243a.5.5,0,0,0,.707,0l.7075-.707a.5.5,0,0,0,0-.707L10.414,9l4.243-4.2425a.5.5,0,0,0,0-.707L13.95,3.343a.5.5,0,0,0-.70711-.00039Z" />
33+
</svg>
34+
</button>
35+
</form>
36+

src/cloud/project/privatelink-service.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ The PrivateLink service integration for {{site.data.var.ece}} projects includes
2525
- You cannot establish SSH connections using PrivateLink. For SSH, use the Magento SSH capabilities. See [Enable SSH keys][].
2626
- Magento support does not cover troubleshooting AWS PrivateLink issues beyond initial enablement.
2727
- Customers are responsible for costs associated with managing their own VPC.
28+
- You cannot use the HTTPS protocol to connect to Magento Commerce over PrivateLink.
2829

2930
## PrivateLink connection types
3031

src/common/images/graphql/paypal-payflow-pro.svg

Lines changed: 1 addition & 1 deletion
Loading

src/guides/v2.3/frontend-dev-guide/themes/js-bundling.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ JavaScript bundling does not work unless Magento is in [production mode][product
4343
bin/magento config:set dev/js/merge_files 0
4444
```
4545

46+
1. Modifying the settings above when Magento is in production mode will require [static view files deployment][static-content]:
47+
48+
```bash
49+
bin/magento setup:static-content:deploy
50+
```
51+
4652
1. Finally, clear the cache:
4753

4854
```bash
@@ -151,5 +157,6 @@ Follow these steps to help you identify which JavaScript files to bundle for you
151157
1. Use the results of that comparison to build your exclude list.
152158

153159
[production-mode]:{{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#production-mode
160+
[static-content]:{{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html
154161
[Advanced-JavaScript-Bundling]:{{ page.baseurl }}/performance-best-practices/advanced-js-bundling.html
155162
[luma-view-xml]:{{ site.mage2bloburl }}/{{ page.guide_version }}/app/design/frontend/Magento/luma/etc/view.xml#L270

src/search.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
22
layout: search
33
title: Search Results
4+
guide_version: "2.4"
45
---

0 commit comments

Comments
 (0)