Skip to content

Commit

Permalink
Merge branch 'main' into feature/34374
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashish-CodeJourney authored Jun 24, 2024
2 parents 8302769 + 75e254f commit 5b81654
Show file tree
Hide file tree
Showing 381 changed files with 4,520 additions and 1,652 deletions.
11 changes: 6 additions & 5 deletions files/en-us/_redirects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3991,7 +3991,7 @@
/en-US/docs/HTTP_Pipelining_FAQ /en-US/docs/Web/HTTP/Connection_management_in_HTTP_1.x
/en-US/docs/HTTP_Transaction_Model /en-US/docs/Web/HTTP
/en-US/docs/HTTP_access_control /en-US/docs/Web/HTTP/CORS
/en-US/docs/How_to_Turn_Off_Form_Autocompletion /en-US/docs/Web/Security/Securing_your_site/Turning_off_form_autocompletion
/en-US/docs/How_to_Turn_Off_Form_Autocompletion /en-US/docs/Web/Security/Practical_implementation_guides/Turning_off_form_autocompletion
/en-US/docs/How_to_check_the_security_state_of_an_XMLHTTPRequest_over_SSL /en-US/docs/Web/API/XMLHttpRequest
/en-US/docs/How_to_create_a_DOM_tree /en-US/docs/Web/API/Document_Object_Model/Using_the_Document_Object_Model
/en-US/docs/How_to_start_contributions_to_Mozilla /en-US/docs/MDN/Community/Contributing/Getting_started
Expand Down Expand Up @@ -6793,7 +6793,7 @@
/en-US/docs/Security/MixedContent/fix_website_with_mixed_content /en-US/docs/Web/Security/Mixed_content#developer_console
/en-US/docs/Security/Mixed_content /en-US/docs/Web/Security/Mixed_content
/en-US/docs/Security/Mixed_content/How_to_fix_website_with_mixed_content /en-US/docs/Web/Security/Mixed_content#developer_console
/en-US/docs/Security/Securing_your_site /en-US/docs/Web/Security/Securing_your_site
/en-US/docs/Security/Securing_your_site /en-US/docs/Web/Security/Practical_implementation_guides
/en-US/docs/Security/Weak_Signature_Algorithm /en-US/docs/Web/Security/Weak_Signature_Algorithm
/en-US/docs/Security_changes_in_Firefox_3.1 /en-US/docs/Mozilla/Firefox/Releases/3.5/Security_changes
/en-US/docs/Security_changes_in_Firefox_3.5 /en-US/docs/Mozilla/Firefox/Releases/3.5/Security_changes
Expand Down Expand Up @@ -11103,7 +11103,7 @@
/en-US/docs/Web/Apps/Progressive/App_structure /en-US/docs/Web/Progressive_web_apps/Tutorials/js13kGames/App_structure
/en-US/docs/Web/Apps/Progressive/Discoverable /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Apps/Progressive/Installable /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Apps/Progressive/Installable_PWAs /en-US/docs/Web/Progressive_web_apps/Tutorials/js13kGames/Installable_PWAs
/en-US/docs/Web/Apps/Progressive/Installable_PWAs /en-US/docs/Web/Progressive_web_apps/Guides/Making_PWAs_installable
/en-US/docs/Web/Apps/Progressive/Introduction /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Apps/Progressive/Linkable /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Apps/Progressive/Loading /en-US/docs/Web/Progressive_web_apps/Tutorials/js13kGames/Loading
Expand Down Expand Up @@ -12554,7 +12554,6 @@
/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/Function.displayName /en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/displayName
/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/constructor /en-US/docs/Web/JavaScript/Reference/Global_Objects/Function
/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/toSource /en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/toString
/en-US/docs/Web/JavaScript/Reference/Global_Objects/GeneratorFunction/prototype /en-US/docs/Web/JavaScript/Reference/Global_Objects/GeneratorFunction
/en-US/docs/Web/JavaScript/Reference/Global_Objects/InternalError/prototype /en-US/docs/Web/JavaScript/Reference/Global_Objects/InternalError
/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl.RelativeTimeFormat /en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat
/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/@@toStringTag /en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl
Expand Down Expand Up @@ -12808,7 +12807,7 @@
/en-US/docs/Web/Progressive_web_apps/Discoverable /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Progressive_web_apps/Guides/Structural_overview /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Progressive_web_apps/Installable /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Progressive_web_apps/Installable_PWAs /en-US/docs/Web/Progressive_web_apps/Tutorials/js13kGames/Installable_PWAs
/en-US/docs/Web/Progressive_web_apps/Installable_PWAs /en-US/docs/Web/Progressive_web_apps/Guides/Making_PWAs_installable
/en-US/docs/Web/Progressive_web_apps/Installing /en-US/docs/Web/Progressive_web_apps/Guides/Installing
/en-US/docs/Web/Progressive_web_apps/Introduction /en-US/docs/Web/Progressive_web_apps
/en-US/docs/Web/Progressive_web_apps/Linkable /en-US/docs/Web/Progressive_web_apps
Expand Down Expand Up @@ -13026,7 +13025,9 @@
/en-US/docs/Web/Security/HTTP_strict_transport_security /en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
/en-US/docs/Web/Security/Mixed_content/How_to_fix_website_with_mixed_content /en-US/docs/Web/Security/Mixed_content#developer_console
/en-US/docs/Web/Security/Public_Key_Pinning /en-US/docs/Web/Security/Certificate_Transparency
/en-US/docs/Web/Security/Securing_your_site /en-US/docs/Web/Security/Practical_implementation_guides
/en-US/docs/Web/Security/Securing_your_site/Configuring_server_MIME_types /en-US/docs/Learn/Server-side/Configuring_server_MIME_types
/en-US/docs/Web/Security/Securing_your_site/Turning_off_form_autocompletion /en-US/docs/Web/Security/Practical_implementation_guides/Turning_off_form_autocompletion
/en-US/docs/Web/WebGL /en-US/docs/Web/API/WebGL_API
/en-US/docs/Web/WebGL/Adding_2D_content_to_a_WebGL_context /en-US/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context
/en-US/docs/Web/WebGL/Animating_objects_with_WebGL /en-US/docs/Web/API/WebGL_API/Tutorial/Animating_objects_with_WebGL
Expand Down
136 changes: 66 additions & 70 deletions files/en-us/_wikihistory.json
Original file line number Diff line number Diff line change
Expand Up @@ -99428,10 +99428,6 @@
"modified": "2020-10-15T22:23:14.705Z",
"contributors": ["j9t", "Malvoz", "bershanskiy"]
},
"Web/HTTP/Headers/Accept-CH-Lifetime": {
"modified": "2020-10-15T22:23:15.388Z",
"contributors": ["bershanskiy"]
},
"Web/HTTP/Headers/Accept-Charset": {
"modified": "2020-10-15T21:48:48.975Z",
"contributors": [
Expand Down Expand Up @@ -126836,6 +126832,72 @@
"evilpie"
]
},
"Web/Security/Practical_implementation": {
"modified": "2020-06-03T13:43:23.202Z",
"contributors": [
"jswisher",
"mfuji09",
"germain",
"sideshowbarker",
"patizenyapetshop",
"larsonreever",
"SebastienParis",
"tlubitz",
"david_ross",
"mbm",
"chrisdavidmills",
"JazibZaman",
"hashedhyphen",
"marumari",
"evilpie",
"Sheppy",
"teoli"
]
},
"Web/Security/Practical_implementation/Turning_off_form_autocompletion": {
"modified": "2020-07-10T21:28:54.938Z",
"contributors": [
"patrickhlauke",
"mfuji09",
"mnoorenberghe",
"leela52452",
"jswisher",
"sruthiveeragandham",
"Nomeh_Uchenna_Gabriel",
"mfluehr",
"WilliamC07",
"hjuhlin",
"chrisdavidmills",
"LouisLazaris",
"devinea2",
"steduardo",
"terrylinooo",
"kbagot",
"stutrek",
"Didglee",
"rottina",
"Delapouite",
"wbamberg",
"John99",
"Manishearth",
"Sheppy",
"ConcreteGannet",
"teoli",
"contrebis",
"dhodder",
"David-Sarah Hopwood",
"George3",
"LonelyPixel",
"Brianegge",
"NickolayBot",
"Andreas Wuest",
"Brycenesbitt",
"Callek",
"VicMan",
"Pmsyyz",
"Mathieu Deaudelin"
]
},
"Web/Security/Referer_header:_privacy_and_security_concerns": {
"modified": "2020-07-22T14:05:46.803Z",
"contributors": [
Expand Down Expand Up @@ -126940,72 +127002,6 @@
"Annevk"
]
},
"Web/Security/Securing_your_site": {
"modified": "2020-06-03T13:43:23.202Z",
"contributors": [
"jswisher",
"mfuji09",
"germain",
"sideshowbarker",
"patizenyapetshop",
"larsonreever",
"SebastienParis",
"tlubitz",
"david_ross",
"mbm",
"chrisdavidmills",
"JazibZaman",
"hashedhyphen",
"marumari",
"evilpie",
"Sheppy",
"teoli"
]
},
"Web/Security/Securing_your_site/Turning_off_form_autocompletion": {
"modified": "2020-07-10T21:28:54.938Z",
"contributors": [
"patrickhlauke",
"mfuji09",
"mnoorenberghe",
"leela52452",
"jswisher",
"sruthiveeragandham",
"Nomeh_Uchenna_Gabriel",
"mfluehr",
"WilliamC07",
"hjuhlin",
"chrisdavidmills",
"LouisLazaris",
"devinea2",
"steduardo",
"terrylinooo",
"kbagot",
"stutrek",
"Didglee",
"rottina",
"Delapouite",
"wbamberg",
"John99",
"Manishearth",
"Sheppy",
"ConcreteGannet",
"teoli",
"contrebis",
"dhodder",
"David-Sarah Hopwood",
"George3",
"LonelyPixel",
"Brianegge",
"NickolayBot",
"Andreas Wuest",
"Brycenesbitt",
"Callek",
"VicMan",
"Pmsyyz",
"Mathieu Deaudelin"
]
},
"Web/Security/Subdomain_takeovers": {
"modified": "2020-08-25T23:27:57.222Z",
"contributors": ["jswisher"]
Expand Down
9 changes: 5 additions & 4 deletions files/en-us/glossary/cross_axis/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ Alignment of items on the cross axis is achieved with the `align-items` property

### Further reading

- CSS Flexbox Guide:
- [Basic Concepts of Flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)
- [Aligning items in a flex container](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Aligning_items_in_a_flex_container)
- [Mastering wrapping of flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Mastering_wrapping_of_flex_items)
CSS flexbox guides:

- [Basic concepts of flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)
- [Aligning items in a flex container](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Aligning_items_in_a_flex_container)
- [Mastering wrapping of flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Mastering_wrapping_of_flex_items)
- [Glossary](/en-US/docs/Glossary)

- {{Glossary("Flex")}}
Expand Down
8 changes: 4 additions & 4 deletions files/en-us/glossary/flex_container/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ A value of `flex` causes the element to become a block level flex container, and

### Further reading

- CSS Flexbox Guide: _[Basic Concepts of Flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)_
- CSS Flexbox Guide: _[Aligning items in a flex container](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Aligning_items_in_a_flex_container)_
- CSS Flexbox Guide: _[Mastering wrapping of flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Mastering_wrapping_of_flex_items)_
- Firefox Developer Tools > How to: _[CSS Flexbox Inspector: Examine Flexbox layouts](https://firefox-source-docs.mozilla.org/devtools-user/page_inspector/how_to/examine_flexbox_layouts/index.html)_
- [Basic concepts of flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)
- [Aligning items in a flex container](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Aligning_items_in_a_flex_container)
- [Mastering wrapping of flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Mastering_wrapping_of_flex_items)
- [CSS flexbox inspector: Examine flexbox layouts](https://firefox-source-docs.mozilla.org/devtools-user/page_inspector/how_to/examine_flexbox_layouts/index.html)
6 changes: 3 additions & 3 deletions files/en-us/glossary/flex_item/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Continuous runs of text inside flex containers will also become flex items.

### Further reading

- CSS Flexbox Guide: _[Basic Concepts of Flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)_
- CSS Flexbox Guide: _[Ordering flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Ordering_flex_items)_
- CSS Flexbox Guide: _[Controlling Ratios of flex items along the main axis](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Controlling_ratios_of_flex_items_along_the_main_axis)_
- [Basic concepts of flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)
- [Ordering flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Ordering_flex_items)
- [Controlling ratios of flex items along the main axis](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Controlling_ratios_of_flex_items_along_the_main_axis)
12 changes: 6 additions & 6 deletions files/en-us/glossary/flexbox/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ page-type: glossary-definition

{{GlossarySidebar}}

Flexbox is the commonly-used name for the [CSS Flexible Box Layout Module](https://www.w3.org/TR/css-flexbox-1/), a layout model for displaying items in a single dimension — as a row or as a column.
Flexbox is the commonly-used name for the [CSS flexible box layout module](/en-US/docs/Web/CSS/CSS_flexible_box_layout), a layout model for displaying items in a single dimension — as a row or as a column.

In the specification, Flexbox is described as a layout model for user interface design. The key feature of Flexbox is the fact that items in a flex layout can grow and shrink. Space can be assigned to the items themselves, or distributed between or around the items.
In the specification, flexbox is described as a layout model for user interface design. The key feature of flexbox is that items in a flex layout can grow and shrink. Space can be assigned to the items themselves, or distributed between or around the items.

Flexbox also enables alignment of items on the main or cross axis, thus providing a high level of control over the size and alignment of a group of items.

Expand All @@ -31,12 +31,12 @@ Flexbox also enables alignment of items on the main or cross axis, thus providin

### Further reading

- _[CSS Flexible Box Layout Module Level 1 Specification](https://www.w3.org/TR/css-flexbox-1/)_
- CSS Flexbox Guide:
- [Basic Concepts of Flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)
- CSS flexbox guides:
- [Basic concepts of flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox)
- [Relationship of flexbox to other layout methods](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Relationship_of_flexbox_to_other_layout_methods)
- [Aligning items in a flex container](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Aligning_items_in_a_flex_container)
- [Ordering flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Ordering_flex_items)
- [Controlling Ratios of flex items along the main axis](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Controlling_ratios_of_flex_items_along_the_main_axis)
- [Controlling ratios of flex items along the main axis](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Controlling_ratios_of_flex_items_along_the_main_axis)
- [Mastering wrapping of flex items](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Mastering_wrapping_of_flex_items)
- [Typical use cases of flexbox](/en-US/docs/Web/CSS/CSS_flexible_box_layout/Typical_use_cases_of_flexbox)
- _[CSS Flexible Box Layout Module Level 1 Specification](https://www.w3.org/TR/css-flexbox-1/)_
4 changes: 2 additions & 2 deletions files/en-us/glossary/grid_areas/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ In the example below I have a grid container with two grid items. I have named t

### Further reading

- CSS Grid Layout Guide:
- CSS grid layout Guide:
- [Basic concepts of grid layout](/en-US/docs/Web/CSS/CSS_grid_layout/Basic_concepts_of_grid_layout)
- [Grid template areas](/en-US/docs/Web/CSS/CSS_grid_layout/Grid_template_areas)
- [Definition of Grid Areas in the CSS Grid Layout specification](https://drafts.csswg.org/css-grid/#grid-area-concept)
- [Definition of grid areas in the CSS grid layout specification](https://drafts.csswg.org/css-grid/#grid-area-concept)
14 changes: 7 additions & 7 deletions files/en-us/glossary/grid_axis/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ page-type: glossary-definition

{{GlossarySidebar}}

CSS Grid Layout is a two-dimensional layout method enabling the laying out of content in _rows_ and _columns_. Therefore in any grid we have two axes. The _block or column axis_, and the _inline or row axis_.
CSS grid layout is a two-dimensional layout method enabling the laying out of content in _rows_ and _columns_. Therefore in any grid we have two axes. The _block or column axis_, and the _inline or row axis_.

It is along these axes that items can be aligned and justified using the properties defined in the [Box Alignment specification](/en-US/docs/Web/CSS/CSS_grid_layout/Box_alignment_in_grid_layout).

In CSS the _block or column axis_ is the axis used when laying out blocks of text. If you have two paragraphs and are working in a right to left, top to bottom language they lay out one below the other, on the block axis.

![Diagram showing the block axis in CSS Grid Layout.](7_block_axis.png)
![Diagram showing the block axis in CSS grid layout.](7_block_axis.png)

The _inline or row axis_ runs across the Block Axis and is the direction along which regular text flows. These are our rows in CSS Grid Layout.
The _inline or row axis_ runs across the Block Axis and is the direction along which regular text flows. These are our rows in CSS grid layout.

![Diagram showing the inline axis in CSS Grid Layout.](7_inline_axis.png)
![Diagram showing the inline axis in CSS grid layout.](7_inline_axis.png)

The physical direction of these axes can change according to the [writing mode](/en-US/docs/Web/CSS/CSS_grid_layout/Grids_logical_values_and_writing_modes) of the document.

## See also

- CSS Grid Layout Guide: _[Basic concepts of grid layout](/en-US/docs/Web/CSS/CSS_grid_layout/Basic_concepts_of_grid_layout)_
- CSS Grid Layout Guide: _[Box alignment in Grid Layout](/en-US/docs/Web/CSS/CSS_grid_layout/Box_alignment_in_grid_layout)_
- CSS Grid Layout Guide: _[Grids, logical values and writing modes](/en-US/docs/Web/CSS/CSS_grid_layout/Grids_logical_values_and_writing_modes)_
- [Basic concepts of grid layout](/en-US/docs/Web/CSS/CSS_grid_layout/Basic_concepts_of_grid_layout)
- [Box alignment in grid layout](/en-US/docs/Web/CSS/CSS_grid_layout/Box_alignment_in_grid_layout)
- [Grids, logical values and writing modes](/en-US/docs/Web/CSS/CSS_grid_layout/Grids_logical_values_and_writing_modes)
6 changes: 3 additions & 3 deletions files/en-us/glossary/grid_cell/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ page-type: glossary-definition

{{GlossarySidebar}}

In a [CSS Grid Layout](/en-US/docs/Web/CSS/CSS_grid_layout), a **grid cell** is the smallest unit you can have on your CSS grid. It is the space between four intersecting {{glossary("grid lines")}} and conceptually much like a table cell.
In a [CSS grid layout](/en-US/docs/Web/CSS/CSS_grid_layout), a **grid cell** is the smallest unit you can have on your CSS grid. It is the space between four intersecting {{glossary("grid lines")}} and conceptually much like a table cell.

![Diagram showing an individual cell on the grid.](1_grid_cell.png)

Expand Down Expand Up @@ -67,5 +67,5 @@ In the example we have created a three column track grid. The five items are pla

### Further reading

- CSS Grid Layout Guide: _[Basic concepts of grid layout](/en-US/docs/Web/CSS/CSS_grid_layout/Basic_concepts_of_grid_layout)_
- [Definition of Grid Cells in the CSS Grid Layout specification](https://drafts.csswg.org/css-grid/#grid-track-concept)
- [Basic concepts of grid layout](/en-US/docs/Web/CSS/CSS_grid_layout/Basic_concepts_of_grid_layout)
- [Definition of grid cells in the CSS grid layout specification](https://drafts.csswg.org/css-grid/#grid-track-concept)
Loading

0 comments on commit 5b81654

Please sign in to comment.