aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/es/_redirects.txt3
-rw-r--r--files/es/_wikihistory.json12
-rw-r--r--files/es/conflicting/web/css/media_queries/using_media_queries/index.html (renamed from files/es/web/progressive_web_apps/responsive/media_types/index.html)4
-rw-r--r--files/fr/_redirects.txt11
-rw-r--r--files/fr/_wikihistory.json56
-rw-r--r--files/fr/conflicting/web/api/keyframeeffect/keyframeeffect/index.md (renamed from files/fr/web/api/effecttiming/index.md)4
-rw-r--r--files/fr/web/api/keyframeeffect/keyframeeffect/index.md (renamed from files/fr/web/api/effecttiming/delay/index.md)4
-rw-r--r--files/fr/web/css/media_queries/using_media_queries/index.html (renamed from files/fr/web/progressive_web_apps/responsive/media_types/index.html)4
-rw-r--r--files/ja/_redirects.txt14
-rw-r--r--files/ja/_wikihistory.json80
-rw-r--r--files/ja/conflicting/web/api/credentialscontainer/create/index.html (renamed from files/ja/web/api/publickeycredentialcreationoptions/excludecredentials/index.html)3
-rw-r--r--files/ja/conflicting/web/api/credentialscontainer/create_18148a708412fc42b1affe2f08eab270/index.html (renamed from files/ja/web/api/publickeycredentialcreationoptions/index.html)4
-rw-r--r--files/ja/conflicting/web/css/media_queries/using_media_queries/index.html (renamed from files/ja/web/progressive_web_apps/responsive/media_types/index.html)3
-rw-r--r--files/ja/web/api/credentialscontainer/create/index.html (renamed from files/ja/web/api/publickeycredentialcreationoptions/authenticatorselection/index.html)3
-rw-r--r--files/ja/web/api/keyframeeffect/keyframeeffect/index.html (renamed from files/ja/web/api/effecttiming/index.html)3
-rw-r--r--files/ja/web/api/rtcpeerconnection/rtcpeerconnection/index.html (renamed from files/ja/web/api/rtcconfiguration/index.html)3
-rw-r--r--files/ko/_redirects.txt12
-rw-r--r--files/ko/_wikihistory.json26
-rw-r--r--files/ko/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html (renamed from files/ko/web/api/rtcconfiguration/index.html)3
-rw-r--r--files/ko/conflicting/web/css/media_queries/using_media_queries/index.html (renamed from files/ko/web/progressive_web_apps/responsive/media_types/index.html)4
-rw-r--r--files/pl/_redirects.txt7
-rw-r--r--files/pl/_wikihistory.json24
-rw-r--r--files/pl/web/css/media_queries/using_media_queries/index.html (renamed from files/pl/web/progressive_web_apps/responsive/media_types/index.html)4
-rw-r--r--files/ru/_redirects.txt1
-rw-r--r--files/ru/_wikihistory.json12
-rw-r--r--files/ru/web/api/keyframeeffect/keyframeeffect/index.html (renamed from files/ru/web/api/effecttiming/index.html)3
-rw-r--r--files/zh-cn/_redirects.txt12
-rw-r--r--files/zh-cn/_wikihistory.json60
-rw-r--r--files/zh-cn/conflicting/web/api/keyframeeffect/keyframeeffect/index.html (renamed from files/zh-cn/web/api/effecttiming/index.html)3
-rw-r--r--files/zh-cn/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html (renamed from files/zh-cn/web/api/rtcconfiguration/index.html)3
-rw-r--r--files/zh-cn/conflicting/web/css/media_queries/using_media_queries/index.html (renamed from files/zh-cn/web/progressive_web_apps/responsive/media_types/index.html)4
-rw-r--r--files/zh-cn/web/api/keyframeeffect/keyframeeffect/index.html (renamed from files/zh-cn/web/api/effecttiming/easing/index.html)3
32 files changed, 201 insertions, 191 deletions
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index a224a5b8a0..1f7c5887bb 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1670,7 +1670,7 @@
/es/docs/Web/CSS/Gradiente /es/docs/Web/CSS/gradient
/es/docs/Web/CSS/Herramientas /es/docs/conflicting/Web/CSS
/es/docs/Web/CSS/Introducción/Content /es/docs/Learn/CSS/Howto/Generated_content
-/es/docs/Web/CSS/Introducción/Media /es/docs/Web/Progressive_web_apps/Responsive/Media_types
+/es/docs/Web/CSS/Introducción/Media /es/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/es/docs/Web/CSS/Preguntas_frecuentes_sobre_CSS /es/docs/Learn/CSS/Howto/CSS_FAQ
/es/docs/Web/CSS/Pseudoelementos /es/docs/Web/CSS/Pseudo-elements
/es/docs/Web/CSS/Referencia_CSS /es/docs/Web/CSS/Reference
@@ -2497,6 +2497,7 @@
/es/docs/Web/Performance/mejorando_rendimienot_inicial /es/docs/Web/Performance/Optimizing_startup_performance
/es/docs/Web/Progressive_web_apps/Developer_guide/Instalar /es/docs/Web/Progressive_web_apps/Installing
/es/docs/Web/Progressive_web_apps/Developer_guide/Installing /es/docs/Web/Progressive_web_apps/Installing
+/es/docs/Web/Progressive_web_apps/Responsive/Media_types /es/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/es/docs/Web/Reference/Events /es/docs/Web/Events
/es/docs/Web/Reference/Events/animationend /es/docs/Web/API/HTMLElement/animationend_event
/es/docs/Web/Reference/Events/beforeunload /es/docs/Web/API/Window/beforeunload_event
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index 1c5f685def..0621825c2c 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -20376,12 +20376,6 @@
"Nachec"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2019-03-18T21:15:11.297Z",
- "contributors": [
- "luismj"
- ]
- },
"Web/SVG": {
"modified": "2019-03-23T23:44:20.243Z",
"contributors": [
@@ -21529,6 +21523,12 @@
"miguelsp"
]
},
+ "conflicting/Web/CSS/Media_Queries/Using_media_queries": {
+ "modified": "2019-03-18T21:15:11.297Z",
+ "contributors": [
+ "luismj"
+ ]
+ },
"conflicting/Web/CSS/cursor": {
"modified": "2019-03-23T22:35:57.612Z",
"contributors": [
diff --git a/files/es/web/progressive_web_apps/responsive/media_types/index.html b/files/es/conflicting/web/css/media_queries/using_media_queries/index.html
index 122b374df8..f585d9f669 100644
--- a/files/es/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/es/conflicting/web/css/media_queries/using_media_queries/index.html
@@ -1,8 +1,8 @@
---
title: Media
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: conflicting/Web/CSS/Media_Queries/Using_media_queries
translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: Web/CSS/Introducción/Media
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<p>{{CSSTutorialTOC}} {{previousPage("/en-US/docs/Web/Guide/CSS/Getting_Started/Tables", "Tables")}}</p>
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index 932b674e10..a425e2ef8d 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -433,7 +433,7 @@
/fr/docs/CSS/Premiers_pas/Les_sélecteurs /fr/docs/conflicting/Learn/CSS/Building_blocks/Selectors_9bc80fea302c91cd60fb72c4e83c83e9
/fr/docs/CSS/Premiers_pas/Listes /fr/docs/conflicting/Learn/CSS/Styling_text/Styling_lists_06e9538892250c13976a84639f0dadd2
/fr/docs/CSS/Premiers_pas/Mise_en_page /fr/docs/conflicting/Learn/CSS/CSS_layout
-/fr/docs/CSS/Premiers_pas/Médias /fr/docs/Web/Progressive_web_apps/Responsive/Media_types
+/fr/docs/CSS/Premiers_pas/Médias /fr/docs/Web/CSS/Media_Queries/Using_media_queries
/fr/docs/CSS/Premiers_pas/Pourquoi_utiliser_CSS /fr/docs/conflicting/Learn/CSS/First_steps/How_CSS_works_ecbda2160290b96c02dcfa8276c0333a
/fr/docs/CSS/Premiers_pas/Présentation_des_CSS /fr/docs/conflicting/Learn/CSS/First_steps/How_CSS_works_dba75d8c56ccc773f03d946ce2dbb25c
/fr/docs/CSS/Premiers_pas/Styles_de_texte /fr/docs/conflicting/Learn/CSS/Styling_text/Fundamentals_8249b1bf53d09b06ed51f43697880b5b
@@ -747,7 +747,7 @@
/fr/docs/CSS:Premiers_pas:Les_sélecteurs /fr/docs/conflicting/Learn/CSS/Building_blocks/Selectors_9bc80fea302c91cd60fb72c4e83c83e9
/fr/docs/CSS:Premiers_pas:Listes /fr/docs/conflicting/Learn/CSS/Styling_text/Styling_lists_06e9538892250c13976a84639f0dadd2
/fr/docs/CSS:Premiers_pas:Mise_en_page /fr/docs/conflicting/Learn/CSS/CSS_layout
-/fr/docs/CSS:Premiers_pas:Médias /fr/docs/Web/Progressive_web_apps/Responsive/Media_types
+/fr/docs/CSS:Premiers_pas:Médias /fr/docs/Web/CSS/Media_Queries/Using_media_queries
/fr/docs/CSS:Premiers_pas:Pourquoi_utiliser_CSS /fr/docs/conflicting/Learn/CSS/First_steps/How_CSS_works_ecbda2160290b96c02dcfa8276c0333a
/fr/docs/CSS:Premiers_pas:Présentation_des_CSS /fr/docs/conflicting/Learn/CSS/First_steps/How_CSS_works_dba75d8c56ccc773f03d946ce2dbb25c
/fr/docs/CSS:Premiers_pas:Styles_de_texte /fr/docs/conflicting/Learn/CSS/Styling_text/Fundamentals_8249b1bf53d09b06ed51f43697880b5b
@@ -3459,8 +3459,8 @@
/fr/docs/Web/API/API_fichier_systeme /fr/docs/Web/API/File_and_Directory_Entries_API
/fr/docs/Web/API/AbstractWorker /fr/docs/orphaned/Web/API/AbstractWorker
/fr/docs/Web/API/Ambient_Light_Events /fr/docs/orphaned/Web/API/Ambient_Light_Events
-/fr/docs/Web/API/AnimationEffectTimingProperties /fr/docs/Web/API/EffectTiming
-/fr/docs/Web/API/AnimationEffectTimingProperties/delay /fr/docs/Web/API/EffectTiming/delay
+/fr/docs/Web/API/AnimationEffectTimingProperties /fr/docs/conflicting/Web/API/KeyframeEffect/KeyframeEffect
+/fr/docs/Web/API/AnimationEffectTimingProperties/delay /fr/docs/Web/API/KeyframeEffect/KeyframeEffect
/fr/docs/Web/API/AnimationEvent.animationName /fr/docs/Web/API/AnimationEvent/animationName
/fr/docs/Web/API/AnimationEvent.elapsedTime /fr/docs/Web/API/AnimationEvent/elapsedTime
/fr/docs/Web/API/AnimationEvent.pseudoElement /fr/docs/Web/API/AnimationEvent/pseudoElement
@@ -3546,6 +3546,8 @@
/fr/docs/Web/API/Document_object_model/Utilisation_du_DOM_Level_1_Core_du_W3C /fr/docs/Web/API/Document_object_model/Using_the_W3C_DOM_Level_1_Core
/fr/docs/Web/API/Document_object_model/Utilisation_du_DOM_Level_1_Core_du_W3C/Exemple /fr/docs/Web/API/Document_object_model/Using_the_W3C_DOM_Level_1_Core/Example
/fr/docs/Web/API/DoubleRange /fr/docs/Web/API/MediaTrackConstraints
+/fr/docs/Web/API/EffectTiming /fr/docs/conflicting/Web/API/KeyframeEffect/KeyframeEffect
+/fr/docs/Web/API/EffectTiming/delay /fr/docs/Web/API/KeyframeEffect/KeyframeEffect
/fr/docs/Web/API/Element.activeElement /fr/docs/Web/API/Document/activeElement
/fr/docs/Web/API/Element.addEventListener /fr/docs/Web/API/EventTarget/addEventListener
/fr/docs/Web/API/Element.appendChild /fr/docs/Web/API/Node/appendChild
@@ -5488,6 +5490,7 @@
/fr/docs/Web/Progressive_web_apps/Progressive /fr/docs/conflicting/Web/Progressive_web_apps_954d3e6cc1e06f006b865b74099f55cf
/fr/docs/Web/Progressive_web_apps/Re-engageable /fr/docs/conflicting/Web/Progressive_web_apps_cb2823fe6cfc1ddee5db1f6a5d240c67
/fr/docs/Web/Progressive_web_apps/Relancer_Via_Notifications_Push /fr/docs/Web/Progressive_web_apps/Re-engageable_Notifications_Push
+/fr/docs/Web/Progressive_web_apps/Responsive/Media_types /fr/docs/Web/CSS/Media_Queries/Using_media_queries
/fr/docs/Web/Progressive_web_apps/Securisee /fr/docs/conflicting/Web/Progressive_web_apps_0d5c38b9aa908cbb52e4c39037b4f28b
/fr/docs/Web/Progressive_web_apps/ajouter_a_lecran_daccueil_a2hs /fr/docs/Web/Progressive_web_apps/Add_to_home_screen
/fr/docs/Web/Reference /fr/docs/orphaned/Web/Reference
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index c76201163e..44ad23bfb9 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -14638,21 +14638,6 @@
"loella16"
]
},
- "Web/API/EffectTiming": {
- "modified": "2019-03-23T22:28:24.754Z",
- "contributors": [
- "SphinxKnight",
- "HereComesJuju",
- "rachelnabors"
- ]
- },
- "Web/API/EffectTiming/delay": {
- "modified": "2019-03-23T22:28:20.379Z",
- "contributors": [
- "SphinxKnight",
- "HereComesJuju"
- ]
- },
"Web/API/Element": {
"modified": "2020-11-10T21:11:37.745Z",
"contributors": [
@@ -17982,6 +17967,13 @@
"tristantheb"
]
},
+ "Web/API/KeyframeEffect/KeyframeEffect": {
+ "modified": "2019-03-23T22:28:20.379Z",
+ "contributors": [
+ "SphinxKnight",
+ "HereComesJuju"
+ ]
+ },
"Web/API/LocalFileSystem": {
"modified": "2020-11-02T04:24:20.566Z",
"contributors": [
@@ -25508,22 +25500,11 @@
]
},
"Web/CSS/Media_Queries/Using_media_queries": {
- "modified": "2020-09-12T11:51:58.821Z",
+ "modified": "2019-03-24T00:11:03.641Z",
"contributors": [
- "kgrandemange",
- "tzilliox",
- "SphinxKnight",
- "JNa0",
- "JeffD",
- "Sebastianz",
- "mrstork",
- "malayaleecoder",
- "adevoufera",
"teoli",
- "wakka27",
- "infogenious",
- "tregagnon",
- "FredB",
+ "grandoc",
+ "Verruckt",
"BenoitL"
]
},
@@ -40379,15 +40360,6 @@
"poum"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2019-03-24T00:11:03.641Z",
- "contributors": [
- "teoli",
- "grandoc",
- "Verruckt",
- "BenoitL"
- ]
- },
"Web/Progressive_web_apps/Responsive/responsive_design_building_blocks": {
"modified": "2019-03-18T20:52:18.105Z",
"contributors": [
@@ -43173,6 +43145,14 @@
"Kalwyn"
]
},
+ "conflicting/Web/API/KeyframeEffect/KeyframeEffect": {
+ "modified": "2019-03-23T22:28:24.754Z",
+ "contributors": [
+ "SphinxKnight",
+ "HereComesJuju",
+ "rachelnabors"
+ ]
+ },
"conflicting/Web/API/MediaTrackConstraints": {
"modified": "2020-10-15T22:35:00.304Z",
"contributors": [
diff --git a/files/fr/web/api/effecttiming/index.md b/files/fr/conflicting/web/api/keyframeeffect/keyframeeffect/index.md
index a92f204fb7..fe343b77e6 100644
--- a/files/fr/web/api/effecttiming/index.md
+++ b/files/fr/conflicting/web/api/keyframeeffect/keyframeeffect/index.md
@@ -1,6 +1,6 @@
---
title: Animation Effect Timing Properties
-slug: Web/API/EffectTiming
+slug: conflicting/Web/API/KeyframeEffect/KeyframeEffect
tags:
- API
- Animation
@@ -10,7 +10,7 @@ tags:
- Interface
- Reference
translation_of: Web/API/EffectTiming
-original_slug: Web/API/AnimationEffectTimingProperties
+original_slug: Web/API/EffectTiming
---
{{SeeCompatTable}}{{APIRef("Web Animations")}}
diff --git a/files/fr/web/api/effecttiming/delay/index.md b/files/fr/web/api/keyframeeffect/keyframeeffect/index.md
index c8480f04d4..d07b0c664f 100644
--- a/files/fr/web/api/effecttiming/delay/index.md
+++ b/files/fr/web/api/keyframeeffect/keyframeeffect/index.md
@@ -1,6 +1,6 @@
---
title: Delay
-slug: Web/API/EffectTiming/delay
+slug: Web/API/KeyframeEffect/KeyframeEffect
tags:
- API
- Animation
@@ -9,7 +9,7 @@ tags:
- Propriété
- Reference
translation_of: Web/API/EffectTiming/delay
-original_slug: Web/API/AnimationEffectTimingProperties/delay
+original_slug: Web/API/EffectTiming/delay
---
{{SeeCompatTable}}{{APIRef("Web Animations")}}
diff --git a/files/fr/web/progressive_web_apps/responsive/media_types/index.html b/files/fr/web/css/media_queries/using_media_queries/index.html
index 05cafc4715..7c38602401 100644
--- a/files/fr/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/fr/web/css/media_queries/using_media_queries/index.html
@@ -1,11 +1,11 @@
---
title: Médias
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: Web/CSS/Media_Queries/Using_media_queries
tags:
- CSS
- CSS:Premiers_pas
translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: CSS/Premiers_pas/Médias
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<p> </p>
<p>La plupart des pages de ce tutoriel sont centrées sur les propriétés CSS et les valeurs que vous pouvez utiliser pour spécifier la façon dont sera affiché un document.</p>
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 009dac7169..3eb6d9ea47 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -264,7 +264,7 @@
/ja/docs/CSS/Getting_Started/JavaScript /ja/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
/ja/docs/CSS/Getting_Started/Layout /ja/docs/Learn/CSS/CSS_layout
/ja/docs/CSS/Getting_Started/Lists /ja/docs/Learn/CSS/Styling_text/Styling_lists
-/ja/docs/CSS/Getting_Started/Media /ja/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ja/docs/CSS/Getting_Started/Media /ja/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ja/docs/CSS/Getting_Started/Selectors /ja/docs/Learn/CSS/Building_blocks/Selectors
/ja/docs/CSS/Getting_Started/Tables /ja/docs/Learn/CSS/Building_blocks/Styling_tables
/ja/docs/CSS/Getting_Started/Text_styles /ja/docs/Learn/CSS/Styling_text/Fundamentals
@@ -2995,7 +2995,7 @@
/ja/docs/Web-d/Guide/CSS/Getting_started/JavaScript /ja/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
/ja/docs/Web-d/Guide/CSS/Getting_started/Layout /ja/docs/Learn/CSS/CSS_layout
/ja/docs/Web-d/Guide/CSS/Getting_started/Lists /ja/docs/Learn/CSS/Styling_text/Styling_lists
-/ja/docs/Web-d/Guide/CSS/Getting_started/Media /ja/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ja/docs/Web-d/Guide/CSS/Getting_started/Media /ja/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ja/docs/Web-d/Guide/CSS/Getting_started/Selectors /ja/docs/Learn/CSS/Building_blocks/Selectors
/ja/docs/Web-d/Guide/CSS/Getting_started/Tables /ja/docs/Learn/CSS/Building_blocks/Styling_tables
/ja/docs/Web-d/Guide/CSS/Getting_started/Text_styles /ja/docs/Learn/CSS/Styling_text/Fundamentals
@@ -3069,6 +3069,7 @@
/ja/docs/Web/API/DocumentOrShadowRoot/styleSheets /ja/docs/Web/API/Document/styleSheets
/ja/docs/Web/API/Document_Object_Model/Events /ja/docs/orphaned/Web/API/Document_Object_Model/Events
/ja/docs/Web/API/Document_Object_Model/Preface /ja/docs/Web/API/Document_Object_Model
+/ja/docs/Web/API/EffectTiming /ja/docs/Web/API/KeyframeEffect/KeyframeEffect
/ja/docs/Web/API/Element.contentEditable /ja/docs/Web/API/HTMLElement/contentEditable
/ja/docs/Web/API/Element.isContentEditable /ja/docs/Web/API/HTMLElement/isContentEditable
/ja/docs/Web/API/Element.querySelector /ja/docs/Web/API/Element/querySelector
@@ -3220,7 +3221,11 @@
/ja/docs/Web/API/Position /ja/docs/Web/API/GeolocationPosition
/ja/docs/Web/API/PositionError /ja/docs/Web/API/GeolocationPositionError
/ja/docs/Web/API/PositionOptions /ja/docs/conflicting/Web/API/Geolocation/getCurrentPosition
+/ja/docs/Web/API/PublicKeyCredentialCreationOptions /ja/docs/conflicting/Web/API/CredentialsContainer/create_18148a708412fc42b1affe2f08eab270
+/ja/docs/Web/API/PublicKeyCredentialCreationOptions/authenticatorSelection /ja/docs/Web/API/CredentialsContainer/create
+/ja/docs/Web/API/PublicKeyCredentialCreationOptions/excludeCredentials /ja/docs/conflicting/Web/API/CredentialsContainer/create
/ja/docs/Web/API/Push_API/Using_the_Push_API /ja/docs/Web/API/Push_API
+/ja/docs/Web/API/RTCConfiguration /ja/docs/Web/API/RTCPeerConnection/RTCPeerConnection
/ja/docs/Web/API/RTCIdentityErrorEvent /ja/docs/orphaned/Web/API/RTCIdentityErrorEvent
/ja/docs/Web/API/RTCIdentityEvent /ja/docs/orphaned/Web/API/RTCIdentityEvent
/ja/docs/Web/API/RTCSessionDescriptionCallback /ja/docs/orphaned/Web/API/RTCSessionDescriptionCallback
@@ -3667,7 +3672,7 @@
/ja/docs/Web/CSS/Getting_started/JavaScript /ja/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
/ja/docs/Web/CSS/Getting_started/Layout /ja/docs/Learn/CSS/CSS_layout
/ja/docs/Web/CSS/Getting_started/Lists /ja/docs/Learn/CSS/Styling_text/Styling_lists
-/ja/docs/Web/CSS/Getting_started/Media /ja/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ja/docs/Web/CSS/Getting_started/Media /ja/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ja/docs/Web/CSS/Getting_started/Selectors /ja/docs/Learn/CSS/Building_blocks/Selectors
/ja/docs/Web/CSS/Getting_started/Tables /ja/docs/Learn/CSS/Building_blocks/Styling_tables
/ja/docs/Web/CSS/Getting_started/Text_styles /ja/docs/Learn/CSS/Styling_text/Fundamentals
@@ -3865,7 +3870,7 @@
/ja/docs/Web/Guide/CSS/Getting_started/JavaScript /ja/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
/ja/docs/Web/Guide/CSS/Getting_started/Layout /ja/docs/Learn/CSS/CSS_layout
/ja/docs/Web/Guide/CSS/Getting_started/Lists /ja/docs/Learn/CSS/Styling_text/Styling_lists
-/ja/docs/Web/Guide/CSS/Getting_started/Media /ja/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ja/docs/Web/Guide/CSS/Getting_started/Media /ja/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ja/docs/Web/Guide/CSS/Getting_started/Selectors /ja/docs/Learn/CSS/Building_blocks/Selectors
/ja/docs/Web/Guide/CSS/Getting_started/Tables /ja/docs/Learn/CSS/Building_blocks/Styling_tables
/ja/docs/Web/Guide/CSS/Getting_started/Text_styles /ja/docs/Learn/CSS/Styling_text/Fundamentals
@@ -4327,6 +4332,7 @@
/ja/docs/Web/Manifest/serviceworker /ja/docs/orphaned/Web/Manifest/serviceworker
/ja/docs/Web/Progressive_web_apps/Advantages /ja/docs/Web/Progressive_web_apps/Introduction
/ja/docs/Web/Progressive_web_apps/Responsive /ja/docs/Web/Progressive_web_apps
+/ja/docs/Web/Progressive_web_apps/Responsive/Media_types /ja/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ja/docs/Web/Reference /ja/docs/Web
/ja/docs/Web/Reference/API /ja/docs/Web/API
/ja/docs/Web/Reference/Events /ja/docs/Web/Events
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 32bd46d27f..b9188fb05d 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -11782,6 +11782,12 @@
"mfuji09"
]
},
+ "Web/API/CredentialsContainer/create": {
+ "modified": "2020-10-15T22:26:48.406Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
"Web/API/Crypto": {
"modified": "2020-10-15T21:59:23.127Z",
"contributors": [
@@ -13545,12 +13551,6 @@
"silverskyvicto"
]
},
- "Web/API/EffectTiming": {
- "modified": "2020-10-15T22:09:51.091Z",
- "contributors": [
- "kay8"
- ]
- },
"Web/API/Element": {
"modified": "2020-10-15T21:14:54.312Z",
"contributors": [
@@ -17952,6 +17952,12 @@
"silverskyvicto"
]
},
+ "Web/API/KeyframeEffect/KeyframeEffect": {
+ "modified": "2020-10-15T22:09:51.091Z",
+ "contributors": [
+ "kay8"
+ ]
+ },
"Web/API/LocalFileSystem": {
"modified": "2020-10-15T22:11:54.611Z",
"contributors": [
@@ -20465,24 +20471,6 @@
"mfuji09"
]
},
- "Web/API/PublicKeyCredentialCreationOptions": {
- "modified": "2020-10-15T22:26:51.081Z",
- "contributors": [
- "mfuji09"
- ]
- },
- "Web/API/PublicKeyCredentialCreationOptions/authenticatorSelection": {
- "modified": "2020-10-15T22:26:48.406Z",
- "contributors": [
- "mfuji09"
- ]
- },
- "Web/API/PublicKeyCredentialCreationOptions/excludeCredentials": {
- "modified": "2020-10-15T22:26:49.264Z",
- "contributors": [
- "mfuji09"
- ]
- },
"Web/API/PublicKeyCredentialRequestOptions": {
"modified": "2020-10-15T22:26:52.032Z",
"contributors": [
@@ -20629,12 +20617,6 @@
"chrisdavidmills"
]
},
- "Web/API/RTCConfiguration": {
- "modified": "2019-03-23T22:51:27.389Z",
- "contributors": [
- "dreissig.jahrhundert"
- ]
- },
"Web/API/RTCDataChannel": {
"modified": "2020-10-15T21:37:37.878Z",
"contributors": [
@@ -20658,6 +20640,12 @@
"dreissig.jahrhundert"
]
},
+ "Web/API/RTCPeerConnection/RTCPeerConnection": {
+ "modified": "2019-03-23T22:51:27.389Z",
+ "contributors": [
+ "dreissig.jahrhundert"
+ ]
+ },
"Web/API/RTCPeerConnection/canTrickleIceCandidates": {
"modified": "2020-10-15T22:29:03.079Z",
"contributors": [
@@ -46583,16 +46571,6 @@
"chrisdavidmills"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2020-05-24T03:45:53.652Z",
- "contributors": [
- "mfuji09",
- "teoli",
- "siokoshou",
- "ethertank",
- "sosleepy"
- ]
- },
"Web/SVG": {
"modified": "2020-04-07T10:06:05.125Z",
"contributors": [
@@ -48575,6 +48553,18 @@
"ethertank"
]
},
+ "conflicting/Web/API/CredentialsContainer/create": {
+ "modified": "2020-10-15T22:26:49.264Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
+ "conflicting/Web/API/CredentialsContainer/create_18148a708412fc42b1affe2f08eab270": {
+ "modified": "2020-10-15T22:26:51.081Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
"conflicting/Web/API/File/name": {
"modified": "2020-09-25T16:45:23.436Z",
"contributors": [
@@ -48630,6 +48620,16 @@
"Wind1808"
]
},
+ "conflicting/Web/CSS/Media_Queries/Using_media_queries": {
+ "modified": "2020-05-24T03:45:53.652Z",
+ "contributors": [
+ "mfuji09",
+ "teoli",
+ "siokoshou",
+ "ethertank",
+ "sosleepy"
+ ]
+ },
"conflicting/Web/Web_Components": {
"modified": "2020-10-15T22:23:11.378Z",
"contributors": [
diff --git a/files/ja/web/api/publickeycredentialcreationoptions/excludecredentials/index.html b/files/ja/conflicting/web/api/credentialscontainer/create/index.html
index 644b69d6c2..7203131ea6 100644
--- a/files/ja/web/api/publickeycredentialcreationoptions/excludecredentials/index.html
+++ b/files/ja/conflicting/web/api/credentialscontainer/create/index.html
@@ -1,6 +1,6 @@
---
title: PublicKeyCredentialCreationOptions.excludeCredentials
-slug: Web/API/PublicKeyCredentialCreationOptions/excludeCredentials
+slug: conflicting/Web/API/CredentialsContainer/create
tags:
- API
- Property
@@ -10,6 +10,7 @@ tags:
- WebAuthn
- プロパティ
translation_of: Web/API/PublicKeyCredentialCreationOptions/excludeCredentials
+original_slug: Web/API/PublicKeyCredentialCreationOptions/excludeCredentials
---
<div>{{APIRef("Web Authentication API")}}{{securecontext_header}}</div>
diff --git a/files/ja/web/api/publickeycredentialcreationoptions/index.html b/files/ja/conflicting/web/api/credentialscontainer/create_18148a708412fc42b1affe2f08eab270/index.html
index a42762c18b..42f3cdcdfa 100644
--- a/files/ja/web/api/publickeycredentialcreationoptions/index.html
+++ b/files/ja/conflicting/web/api/credentialscontainer/create_18148a708412fc42b1affe2f08eab270/index.html
@@ -1,6 +1,7 @@
---
title: PublicKeyCredentialCreationOptions
-slug: Web/API/PublicKeyCredentialCreationOptions
+slug: >-
+ conflicting/Web/API/CredentialsContainer/create_18148a708412fc42b1affe2f08eab270
tags:
- API
- Dictionary
@@ -9,6 +10,7 @@ tags:
- Web Authentication API
- WebAuthn
translation_of: Web/API/PublicKeyCredentialCreationOptions
+original_slug: Web/API/PublicKeyCredentialCreationOptions
---
<div>{{APIRef("Web Authentication API")}}{{securecontext_header}}</div>
diff --git a/files/ja/web/progressive_web_apps/responsive/media_types/index.html b/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html
index 9f1d90396e..fa90c0bda0 100644
--- a/files/ja/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html
@@ -1,6 +1,6 @@
---
title: メディア
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: conflicting/Web/CSS/Media_Queries/Using_media_queries
tags:
- CSS
- Example
@@ -12,6 +12,7 @@ tags:
- ガイド
- 中級者
translation_of: Web/Progressive_web_apps/Responsive/Media_types
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<div>{{QuickLinksWithSubpages("/ja/docs/Web/Progressive_web_apps/Responsive/")}}</div>
diff --git a/files/ja/web/api/publickeycredentialcreationoptions/authenticatorselection/index.html b/files/ja/web/api/credentialscontainer/create/index.html
index 263bd66b0a..3f786e8a8f 100644
--- a/files/ja/web/api/publickeycredentialcreationoptions/authenticatorselection/index.html
+++ b/files/ja/web/api/credentialscontainer/create/index.html
@@ -1,6 +1,6 @@
---
title: PublicKeyCredentialCreationOptions.authenticatorSelection
-slug: Web/API/PublicKeyCredentialCreationOptions/authenticatorSelection
+slug: Web/API/CredentialsContainer/create
tags:
- API
- Property
@@ -9,6 +9,7 @@ tags:
- Web Authentication API
- WebAuthn
translation_of: Web/API/PublicKeyCredentialCreationOptions/authenticatorSelection
+original_slug: Web/API/PublicKeyCredentialCreationOptions/authenticatorSelection
---
<div>{{APIRef("Web Authentication API")}}{{securecontext_header}}</div>
diff --git a/files/ja/web/api/effecttiming/index.html b/files/ja/web/api/keyframeeffect/keyframeeffect/index.html
index ba4e93cb98..60ce39d1af 100644
--- a/files/ja/web/api/effecttiming/index.html
+++ b/files/ja/web/api/keyframeeffect/keyframeeffect/index.html
@@ -1,7 +1,8 @@
---
title: EffectTiming
-slug: Web/API/EffectTiming
+slug: Web/API/KeyframeEffect/KeyframeEffect
translation_of: Web/API/EffectTiming
+original_slug: Web/API/EffectTiming
---
<div>{{ SeeCompatTable() }}{{ APIRef("Web Animations") }}</div>
diff --git a/files/ja/web/api/rtcconfiguration/index.html b/files/ja/web/api/rtcpeerconnection/rtcpeerconnection/index.html
index 2e26eaceef..1527f34ea2 100644
--- a/files/ja/web/api/rtcconfiguration/index.html
+++ b/files/ja/web/api/rtcpeerconnection/rtcpeerconnection/index.html
@@ -1,7 +1,8 @@
---
title: RTCConfiguration
-slug: Web/API/RTCConfiguration
+slug: Web/API/RTCPeerConnection/RTCPeerConnection
translation_of: Web/API/RTCConfiguration
+original_slug: Web/API/RTCConfiguration
---
<p>{{APIRef("WebRTC")}}<span class="seoSummary"><code>RTCConfigurationは、</code>{{domxref("RTCPeerConnection")}} オブジェクトを介して ice server設定を初期化するためのものです 。 </span></p>
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index d6a4be6090..aed0b20724 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -30,7 +30,7 @@
/ko/docs/CSS/Getting_Started/Content /ko/docs/Learn/CSS/Howto/Generated_content
/ko/docs/CSS/Getting_Started/How_CSS_works /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS/Getting_Started/JavaScript /ko/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
-/ko/docs/CSS/Getting_Started/Media /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/CSS/Getting_Started/Media /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/CSS/Getting_Started/SVG_graphics /ko/docs/Web/SVG/Tutorial/SVG_and_CSS
/ko/docs/CSS/Getting_Started/Selectors /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/CSS/Getting_Started/What_is_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -66,7 +66,7 @@
/ko/docs/CSS/시작하기/CSS_동작_원리 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS/시작하기/CSS란 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS/시작하기/내용물 /ko/docs/Learn/CSS/Howto/Generated_content
-/ko/docs/CSS/시작하기/미디어 /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/CSS/시작하기/미디어 /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/CSS/시작하기/색상 /en-US/docs/Learn/CSS/Building_blocks/Values_and_units
/ko/docs/CSS/시작하기/설렉터 /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/CSS/시작하기/왜_CSS를_사용하나 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -76,7 +76,7 @@
/ko/docs/CSS:Getting_Started:Content /ko/docs/Learn/CSS/Howto/Generated_content
/ko/docs/CSS:Getting_Started:How_CSS_works /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS:Getting_Started:JavaScript /ko/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
-/ko/docs/CSS:Getting_Started:Media /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/CSS:Getting_Started:Media /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/CSS:Getting_Started:SVG_graphics /ko/docs/Web/SVG/Tutorial/SVG_and_CSS
/ko/docs/CSS:Getting_Started:Selectors /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/CSS:Getting_Started:What_is_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -474,6 +474,7 @@
/ko/docs/Web/API/ParentNode/childElementCount /ko/docs/Web/API/Element/childElementCount
/ko/docs/Web/API/Position /ko/docs/Web/API/GeolocationPosition
/ko/docs/Web/API/PositionOptions /ko/docs/conflicting/Web/API/Geolocation/getCurrentPosition
+/ko/docs/Web/API/RTCConfiguration /ko/docs/conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
/ko/docs/Web/API/RandomSource /ko/docs/Web/API/Crypto/getRandomValues
/ko/docs/Web/API/RandomSource/getRandomValues /ko/docs/Web/API/Crypto/getRandomValues
/ko/docs/Web/API/Screen.lockOrientation /ko/docs/Web/API/Screen/lockOrientation
@@ -532,7 +533,7 @@
/ko/docs/Web/CSS/Getting_Started/Content /ko/docs/Learn/CSS/Howto/Generated_content
/ko/docs/Web/CSS/Getting_Started/How_CSS_works /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/Web/CSS/Getting_Started/JavaScript /ko/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
-/ko/docs/Web/CSS/Getting_Started/Media /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/Web/CSS/Getting_Started/Media /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/Web/CSS/Getting_Started/SVG_graphics /ko/docs/Web/SVG/Tutorial/SVG_and_CSS
/ko/docs/Web/CSS/Getting_Started/Selectors /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/Web/CSS/Getting_Started/What_is_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -563,7 +564,7 @@
/ko/docs/Web/CSS/시작하기/CSS_동작_원리 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/Web/CSS/시작하기/CSS란 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/Web/CSS/시작하기/내용물 /ko/docs/Learn/CSS/Howto/Generated_content
-/ko/docs/Web/CSS/시작하기/미디어 /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/Web/CSS/시작하기/미디어 /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/Web/CSS/시작하기/색상 /en-US/docs/Learn/CSS/Building_blocks/Values_and_units
/ko/docs/Web/CSS/시작하기/설렉터 /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/Web/CSS/시작하기/왜_CSS를_사용하나 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -684,6 +685,7 @@
/ko/docs/Web/Media/Formats/코덱파라미터 /ko/docs/Web/Media/Formats/codecs_parameter
/ko/docs/Web/Performance/브라우저는_어떻게_동작하는가 /ko/docs/Web/Performance/How_browsers_work
/ko/docs/Web/Performance/중요_렌더링_경로 /ko/docs/Web/Performance/Critical_rendering_path
+/ko/docs/Web/Progressive_web_apps/Responsive/Media_types /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/Web/Progressive_web_apps/소개 /ko/docs/Web/Progressive_web_apps/Introduction
/ko/docs/Web/Reference/Events /ko/docs/Web/Events
/ko/docs/Web/Reference/Events/DOMContentLoaded /ko/docs/Web/API/Window/DOMContentLoaded_event
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index c5aa83f753..81711a9810 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -6112,12 +6112,6 @@
"younheeJang"
]
},
- "Web/API/RTCConfiguration": {
- "modified": "2020-10-15T22:21:34.262Z",
- "contributors": [
- "chansbro"
- ]
- },
"Web/API/RTCDataChannelEvent": {
"modified": "2020-10-15T22:21:45.154Z",
"contributors": [
@@ -16248,13 +16242,6 @@
"cs09g"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2019-03-23T23:33:02.082Z",
- "contributors": [
- "teoli",
- "SpikeYou"
- ]
- },
"Web/SVG": {
"modified": "2019-11-05T05:19:15.768Z",
"contributors": [
@@ -17544,6 +17531,12 @@
"Saem"
]
},
+ "conflicting/Web/API/RTCPeerConnection/RTCPeerConnection": {
+ "modified": "2020-10-15T22:21:34.262Z",
+ "contributors": [
+ "chansbro"
+ ]
+ },
"conflicting/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL": {
"modified": "2019-03-23T22:54:05.275Z",
"contributors": [
@@ -17580,6 +17573,13 @@
"jaemin_jo"
]
},
+ "conflicting/Web/CSS/Media_Queries/Using_media_queries": {
+ "modified": "2019-03-23T23:33:02.082Z",
+ "contributors": [
+ "teoli",
+ "SpikeYou"
+ ]
+ },
"conflicting/Web/Guide": {
"modified": "2019-03-23T23:41:47.329Z",
"contributors": [
diff --git a/files/ko/web/api/rtcconfiguration/index.html b/files/ko/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
index bc578aaf53..e96f592c1e 100644
--- a/files/ko/web/api/rtcconfiguration/index.html
+++ b/files/ko/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
@@ -1,6 +1,6 @@
---
title: RTCConfiguration
-slug: Web/API/RTCConfiguration
+slug: conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
tags:
- API
- Dictionary
@@ -8,6 +8,7 @@ tags:
- RTCConfiguration
- WebRTC
translation_of: Web/API/RTCConfiguration
+original_slug: Web/API/RTCConfiguration
---
<p>{{APIRef("WebRTC")}}{{draft}}</p>
diff --git a/files/ko/web/progressive_web_apps/responsive/media_types/index.html b/files/ko/conflicting/web/css/media_queries/using_media_queries/index.html
index 3c907f9c9b..d6e1f769a0 100644
--- a/files/ko/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/ko/conflicting/web/css/media_queries/using_media_queries/index.html
@@ -1,8 +1,8 @@
---
title: 미디어
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: conflicting/Web/CSS/Media_Queries/Using_media_queries
translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: Web/CSS/시작하기/미디어
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<p>{{ CSSTutorialTOC() }}</p>
<div class="warning">
diff --git a/files/pl/_redirects.txt b/files/pl/_redirects.txt
index d9d3d97538..69f793ad43 100644
--- a/files/pl/_redirects.txt
+++ b/files/pl/_redirects.txt
@@ -63,7 +63,7 @@
/pl/docs/CSS/Na_początek/Kaskadowość_i_dziedziczenie /pl/docs/Learn/CSS/Building_blocks/Cascade_and_inheritance
/pl/docs/CSS/Na_początek/Kolor /pl/docs/Learn/CSS/Building_blocks/Values_and_units
/pl/docs/CSS/Na_początek/Listy /pl/docs/Learn/CSS/Styling_text/Styling_lists
-/pl/docs/CSS/Na_początek/Media /pl/docs/Web/Progressive_web_apps/Responsive/Media_types
+/pl/docs/CSS/Na_początek/Media /pl/docs/Web/CSS/Media_Queries/Using_media_queries
/pl/docs/CSS/Na_początek/Selektory /pl/docs/Learn/CSS/Building_blocks/Selectors
/pl/docs/CSS/Na_początek/Style_tekstowe /pl/docs/Learn/CSS/Styling_text/Fundamentals
/pl/docs/CSS/Na_początek/Tabele /pl/docs/Learn/CSS/Building_blocks/Styling_tables
@@ -178,7 +178,7 @@
/pl/docs/CSS:Na_początek:Kaskadowość_i_dziedziczenie /pl/docs/Learn/CSS/Building_blocks/Cascade_and_inheritance
/pl/docs/CSS:Na_początek:Kolor /pl/docs/Learn/CSS/Building_blocks/Values_and_units
/pl/docs/CSS:Na_początek:Listy /pl/docs/Learn/CSS/Styling_text/Styling_lists
-/pl/docs/CSS:Na_początek:Media /pl/docs/Web/Progressive_web_apps/Responsive/Media_types
+/pl/docs/CSS:Na_początek:Media /pl/docs/Web/CSS/Media_Queries/Using_media_queries
/pl/docs/CSS:Na_początek:Selektory /pl/docs/Learn/CSS/Building_blocks/Selectors
/pl/docs/CSS:Na_początek:Style_tekstowe /pl/docs/Learn/CSS/Styling_text/Fundamentals
/pl/docs/CSS:Na_początek:Tabele /pl/docs/Learn/CSS/Building_blocks/Styling_tables
@@ -1564,7 +1564,7 @@
/pl/docs/Web/CSS/Na_początek/Kaskadowość_i_dziedziczenie /pl/docs/Learn/CSS/Building_blocks/Cascade_and_inheritance
/pl/docs/Web/CSS/Na_początek/Kolor /pl/docs/Learn/CSS/Building_blocks/Values_and_units
/pl/docs/Web/CSS/Na_początek/Listy /pl/docs/Learn/CSS/Styling_text/Styling_lists
-/pl/docs/Web/CSS/Na_początek/Media /pl/docs/Web/Progressive_web_apps/Responsive/Media_types
+/pl/docs/Web/CSS/Na_początek/Media /pl/docs/Web/CSS/Media_Queries/Using_media_queries
/pl/docs/Web/CSS/Na_początek/Selektory /pl/docs/Learn/CSS/Building_blocks/Selectors
/pl/docs/Web/CSS/Na_początek/Style_tekstowe /pl/docs/Learn/CSS/Styling_text/Fundamentals
/pl/docs/Web/CSS/Na_początek/Tables /pl/docs/Learn/CSS/Building_blocks/Styling_tables
@@ -2156,6 +2156,7 @@
/pl/docs/Web/JavaScript/Referencje/Własnościundefined /pl/docs/Web/JavaScript/Reference/Global_Objects/undefined
/pl/docs/Web/JavaScript/Zasoby_języka_JavaScript /pl/docs/Web/JavaScript/Language_Resources
/pl/docs/Web/JavaScript/dziedziczenie_lancuch_prototypow /pl/docs/Web/JavaScript/Inheritance_and_the_prototype_chain
+/pl/docs/Web/Progressive_web_apps/Responsive/Media_types /pl/docs/Web/CSS/Media_Queries/Using_media_queries
/pl/docs/Web/SVG/Element/okrąg /pl/docs/Web/SVG/Element/circle
/pl/docs/Web/SVG/Inne_zasoby /pl/docs/Web/SVG/Other_Resources
/pl/docs/Web/SVG/Przewodnik /pl/docs/Web/SVG/Tutorial
diff --git a/files/pl/_wikihistory.json b/files/pl/_wikihistory.json
index 09762278b7..5acd092626 100644
--- a/files/pl/_wikihistory.json
+++ b/files/pl/_wikihistory.json
@@ -4299,6 +4299,18 @@
"P0lip"
]
},
+ "Web/CSS/Media_Queries/Using_media_queries": {
+ "modified": "2019-03-23T23:43:37.766Z",
+ "contributors": [
+ "teoli",
+ "Verruckt",
+ "gandalf",
+ "Takenbot",
+ "Ptak82",
+ "Anonymous",
+ "Witia"
+ ]
+ },
"Web/CSS/Mozilla_Extensions": {
"modified": "2019-03-24T00:14:13.075Z",
"contributors": [
@@ -8731,18 +8743,6 @@
"abes21111984"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2019-03-23T23:43:37.766Z",
- "contributors": [
- "teoli",
- "Verruckt",
- "gandalf",
- "Takenbot",
- "Ptak82",
- "Anonymous",
- "Witia"
- ]
- },
"Web/SVG": {
"modified": "2019-03-23T23:48:48.350Z",
"contributors": [
diff --git a/files/pl/web/progressive_web_apps/responsive/media_types/index.html b/files/pl/web/css/media_queries/using_media_queries/index.html
index 2314709ef4..cf0f055224 100644
--- a/files/pl/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/pl/web/css/media_queries/using_media_queries/index.html
@@ -1,10 +1,10 @@
---
title: Media
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: Web/CSS/Media_Queries/Using_media_queries
tags:
- CSS:Na_początek
translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: Web/CSS/Na_początek/Media
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<p>
</p><p>Wiele stron tego kursu skupiało się na własnościach i wartościach CSS, których możesz użyć do określania wyglądu dokumentu.
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index 4ad88d5364..9674c73864 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -319,6 +319,7 @@
/ru/docs/Web/API/Document/domConfig /ru/docs/Web/API/Document
/ru/docs/Web/API/DocumentOrShadowRoot/activeElement /ru/docs/Web/API/Document/activeElement
/ru/docs/Web/API/DocumentOrShadowRoot/getSelection /ru/docs/Web/API/Document/getSelection
+/ru/docs/Web/API/EffectTiming /ru/docs/Web/API/KeyframeEffect/KeyframeEffect
/ru/docs/Web/API/Element.getBoundingClientRect /ru/docs/Web/API/Element/getBoundingClientRect
/ru/docs/Web/API/Element.insertAdjacentHTML /ru/docs/Web/API/Element/insertAdjacentHTML
/ru/docs/Web/API/Element/accessKey /ru/docs/Web/API/HTMLElement/accessKey
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index b5f01c9af2..b587e6f583 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -7222,12 +7222,6 @@
"tavira"
]
},
- "Web/API/EffectTiming": {
- "modified": "2020-10-15T22:29:01.473Z",
- "contributors": [
- "Kami-san"
- ]
- },
"Web/API/Element": {
"modified": "2020-10-15T21:21:45.874Z",
"contributors": [
@@ -9234,6 +9228,12 @@
"Tvortsa"
]
},
+ "Web/API/KeyframeEffect/KeyframeEffect": {
+ "modified": "2020-10-15T22:29:01.473Z",
+ "contributors": [
+ "Kami-san"
+ ]
+ },
"Web/API/Location": {
"modified": "2019-08-09T02:31:05.855Z",
"contributors": [
diff --git a/files/ru/web/api/effecttiming/index.html b/files/ru/web/api/keyframeeffect/keyframeeffect/index.html
index 4270a9983d..1106061704 100644
--- a/files/ru/web/api/effecttiming/index.html
+++ b/files/ru/web/api/keyframeeffect/keyframeeffect/index.html
@@ -1,6 +1,6 @@
---
title: EffectTiming
-slug: Web/API/EffectTiming
+slug: Web/API/KeyframeEffect/KeyframeEffect
tags:
- API
- Animation
@@ -11,6 +11,7 @@ tags:
- web animation
- web animation api
translation_of: Web/API/EffectTiming
+original_slug: Web/API/EffectTiming
---
<div>{{ SeeCompatTable() }}{{ APIRef("Web Animations") }}</div>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index ce34e4236f..6a81ba4b59 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -121,7 +121,7 @@
/zh-CN/docs/CSS/动画 /zh-CN/docs/Web/CSS/animation
/zh-CN/docs/CSS/开始/Content /zh-CN/docs/Learn/CSS/Howto/Generated_content
/zh-CN/docs/CSS/开始/SVG_and_CSS /zh-CN/docs/Web/SVG/Tutorial/SVG_and_CSS
-/zh-CN/docs/CSS/开始/媒体 /zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/CSS/开始/媒体 /zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/zh-CN/docs/CSS:Getting_Started:Content /zh-CN/docs/Learn/CSS/Howto/Generated_content
/zh-CN/docs/CSS:Media:Visual /zh-CN/docs/Web/CSS/@media
/zh-CN/docs/CSS:background /zh-CN/docs/Web/CSS/background
@@ -1270,6 +1270,8 @@
/zh-CN/docs/Web/API/DocumentOrShadowRoot/getSelection /zh-CN/docs/Web/API/Document/getSelection
/zh-CN/docs/Web/API/DocumentOrShadowRoot/pointerLockElement /zh-CN/docs/Web/API/Document/pointerLockElement
/zh-CN/docs/Web/API/DocumentOrShadowRoot/styleSheets /zh-CN/docs/Web/API/Document/styleSheets
+/zh-CN/docs/Web/API/EffectTiming /zh-CN/docs/conflicting/Web/API/KeyframeEffect/KeyframeEffect
+/zh-CN/docs/Web/API/EffectTiming/easing /zh-CN/docs/Web/API/KeyframeEffect/KeyframeEffect
/zh-CN/docs/Web/API/Element.classList /zh-CN/docs/Web/API/Element/classList
/zh-CN/docs/Web/API/Element.className /zh-CN/docs/Web/API/Element/className
/zh-CN/docs/Web/API/Element.clientLeft /zh-CN/docs/Web/API/Element/clientLeft
@@ -1452,6 +1454,7 @@
/zh-CN/docs/Web/API/PositionError /zh-CN/docs/Web/API/GeolocationPositionError
/zh-CN/docs/Web/API/PositionOptions /zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition
/zh-CN/docs/Web/API/PositionOptions/timeout /zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6
+/zh-CN/docs/Web/API/RTCConfiguration /zh-CN/docs/conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
/zh-CN/docs/Web/API/RandomSource/getRandomValues /zh-CN/docs/Web/API/Crypto/getRandomValues
/zh-CN/docs/Web/API/Response/克隆 /zh-CN/docs/Web/API/Response/clone
/zh-CN/docs/Web/API/SVGPathElement/getTotalLength /zh-CN/docs/Web/API/SVGGeometryElement/getTotalLength
@@ -1789,7 +1792,7 @@
/zh-CN/docs/Web/CSS/实际值 /zh-CN/docs/Web/CSS/actual_value
/zh-CN/docs/Web/CSS/开始/Content /zh-CN/docs/Learn/CSS/Howto/Generated_content
/zh-CN/docs/Web/CSS/开始/SVG_and_CSS /zh-CN/docs/Web/SVG/Tutorial/SVG_and_CSS
-/zh-CN/docs/Web/CSS/开始/媒体 /zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/Web/CSS/开始/媒体 /zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/zh-CN/docs/Web/CSS/整型 /zh-CN/docs/Web/CSS/integer
/zh-CN/docs/Web/CSS/文本修饰 /zh-CN/docs/Web/CSS/text-decoration
/zh-CN/docs/Web/CSS/文本装饰线厚度(粗细) /zh-CN/docs/Web/CSS/text-decoration-thickness
@@ -1890,9 +1893,9 @@
/zh-CN/docs/Web/Guide/CSS/Consistent_list_indentation /zh-CN/docs/Web/CSS/CSS_Lists_and_Counters/Consistent_list_indentation
/zh-CN/docs/Web/Guide/CSS/Counters /zh-CN/docs/Web/CSS/CSS_Lists_and_Counters/Using_CSS_counters
/zh-CN/docs/Web/Guide/CSS/Getting_started/Content /zh-CN/docs/Learn/CSS/Howto/Generated_content
-/zh-CN/docs/Web/Guide/CSS/Getting_started/Media /zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/Web/Guide/CSS/Getting_started/Media /zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/zh-CN/docs/Web/Guide/CSS/Getting_started/SVG_and_CSS /zh-CN/docs/Web/SVG/Tutorial/SVG_and_CSS
-/zh-CN/docs/Web/Guide/CSS/Getting_started/媒体 /zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/Web/Guide/CSS/Getting_started/媒体 /zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/zh-CN/docs/Web/Guide/CSS/Media_queries /zh-CN/docs/Web/CSS/Media_Queries/Using_media_queries
/zh-CN/docs/Web/Guide/CSS/Testing_media_queries /zh-CN/docs/Web/CSS/Media_Queries/Testing_media_queries
/zh-CN/docs/Web/Guide/CSS/Understanding_z_index /zh-CN/docs/Web/CSS/CSS_Positioning/Understanding_z_index
@@ -2183,6 +2186,7 @@
/zh-CN/docs/Web/JavaScript/重新认识js /zh-CN/docs/Web/JavaScript/A_re-introduction_to_JavaScript
/zh-CN/docs/Web/Media/Formats/视频编解码器 /zh-CN/docs/Web/Media/Formats/Video_codecs
/zh-CN/docs/Web/Performance/浏览器渲染页面的工作原理 /zh-CN/docs/Web/Performance/How_browsers_work
+/zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types /zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/zh-CN/docs/Web/Progressive_web_apps/加载 /zh-CN/docs/Web/Progressive_web_apps/Loading
/zh-CN/docs/Web/Progressive_web_apps/添加到主屏幕 /zh-CN/docs/Web/Progressive_web_apps/Add_to_home_screen
/zh-CN/docs/Web/SVG/Attribute/文本锚点 /zh-CN/docs/Web/SVG/Attribute/text-anchor
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index e686e78005..621cc7ce23 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -11855,18 +11855,6 @@
"rainliang65536"
]
},
- "Web/API/EffectTiming": {
- "modified": "2020-10-15T22:30:45.773Z",
- "contributors": [
- "sideshowbarker"
- ]
- },
- "Web/API/EffectTiming/easing": {
- "modified": "2020-10-15T22:30:45.316Z",
- "contributors": [
- "qiufeihong2018"
- ]
- },
"Web/API/Element": {
"modified": "2020-10-15T21:04:09.528Z",
"contributors": [
@@ -16576,6 +16564,12 @@
"cuixiping"
]
},
+ "Web/API/KeyframeEffect/KeyframeEffect": {
+ "modified": "2020-10-15T22:30:45.316Z",
+ "contributors": [
+ "qiufeihong2018"
+ ]
+ },
"Web/API/LocalFileSystemSync": {
"modified": "2019-03-23T22:09:04.520Z",
"contributors": [
@@ -18809,12 +18803,6 @@
"BettyCHEN"
]
},
- "Web/API/RTCConfiguration": {
- "modified": "2019-03-23T22:18:59.231Z",
- "contributors": [
- "moshoujingli"
- ]
- },
"Web/API/RTCDataChannel": {
"modified": "2019-03-23T23:04:49.663Z",
"contributors": [
@@ -44646,18 +44634,6 @@
"githubxiaominge"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2019-03-23T23:12:04.497Z",
- "contributors": [
- "Robinx",
- "Harvesty",
- "jasonzhyan",
- "ziyunfei",
- "yeol",
- "teoli",
- "Chajn"
- ]
- },
"Web/Progressive_web_apps/Responsive/responsive_design_building_blocks": {
"modified": "2020-11-17T04:04:41.165Z",
"contributors": [
@@ -47155,6 +47131,12 @@
"Taoja"
]
},
+ "conflicting/Web/API/KeyframeEffect/KeyframeEffect": {
+ "modified": "2020-10-15T22:30:45.773Z",
+ "contributors": [
+ "sideshowbarker"
+ ]
+ },
"conflicting/Web/API/MouseEvent/altKey": {
"modified": "2019-03-24T00:16:10.184Z",
"contributors": [
@@ -47253,6 +47235,12 @@
"hibernake"
]
},
+ "conflicting/Web/API/RTCPeerConnection/RTCPeerConnection": {
+ "modified": "2019-03-23T22:18:59.231Z",
+ "contributors": [
+ "moshoujingli"
+ ]
+ },
"conflicting/Web/API/StorageManager/estimate": {
"modified": "2019-03-18T21:31:04.064Z",
"contributors": [
@@ -47516,6 +47504,18 @@
"lazurey"
]
},
+ "conflicting/Web/CSS/Media_Queries/Using_media_queries": {
+ "modified": "2019-03-23T23:12:04.497Z",
+ "contributors": [
+ "Robinx",
+ "Harvesty",
+ "jasonzhyan",
+ "ziyunfei",
+ "yeol",
+ "teoli",
+ "Chajn"
+ ]
+ },
"conflicting/Web/CSS/easing-function": {
"modified": "2020-10-15T21:21:10.131Z",
"contributors": [
diff --git a/files/zh-cn/web/api/effecttiming/index.html b/files/zh-cn/conflicting/web/api/keyframeeffect/keyframeeffect/index.html
index f0b2b7c289..54afe3285e 100644
--- a/files/zh-cn/web/api/effecttiming/index.html
+++ b/files/zh-cn/conflicting/web/api/keyframeeffect/keyframeeffect/index.html
@@ -1,6 +1,6 @@
---
title: EffectTiming
-slug: Web/API/EffectTiming
+slug: conflicting/Web/API/KeyframeEffect/KeyframeEffect
tags:
- API
- Animation
@@ -16,6 +16,7 @@ tags:
- animate
- web animations api
translation_of: Web/API/EffectTiming
+original_slug: Web/API/EffectTiming
---
<div>{{ SeeCompatTable() }}{{ APIRef("Web Animations") }}</div>
diff --git a/files/zh-cn/web/api/rtcconfiguration/index.html b/files/zh-cn/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
index ace1a5c5b6..0d48c5aaa4 100644
--- a/files/zh-cn/web/api/rtcconfiguration/index.html
+++ b/files/zh-cn/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
@@ -1,7 +1,8 @@
---
title: RTCConfiguration
-slug: Web/API/RTCConfiguration
+slug: conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
translation_of: Web/API/RTCConfiguration
+original_slug: Web/API/RTCConfiguration
---
<p>{{APIRef("WebRTC")}}{{draft}}</p>
diff --git a/files/zh-cn/web/progressive_web_apps/responsive/media_types/index.html b/files/zh-cn/conflicting/web/css/media_queries/using_media_queries/index.html
index aed512780b..cd416c970a 100644
--- a/files/zh-cn/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/zh-cn/conflicting/web/css/media_queries/using_media_queries/index.html
@@ -1,8 +1,8 @@
---
title: 媒体
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: conflicting/Web/CSS/Media_Queries/Using_media_queries
translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: Web/Guide/CSS/Getting_started/Media
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<p>{{CSSTutorialTOC}} {{previousPage("/zh-CN/docs/Web/Guide/CSS/Getting_Started/Tables", "表格")}}</p>
diff --git a/files/zh-cn/web/api/effecttiming/easing/index.html b/files/zh-cn/web/api/keyframeeffect/keyframeeffect/index.html
index 0ee0bfea9f..08c21a6791 100644
--- a/files/zh-cn/web/api/effecttiming/easing/index.html
+++ b/files/zh-cn/web/api/keyframeeffect/keyframeeffect/index.html
@@ -1,7 +1,8 @@
---
title: EffectTiming.easing
-slug: Web/API/EffectTiming/easing
+slug: Web/API/KeyframeEffect/KeyframeEffect
translation_of: Web/API/EffectTiming/easing
+original_slug: Web/API/EffectTiming/easing
---
<div>{{ SeeCompatTable() }}{{ APIRef("Web Animations") }}</div>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 11:58:35 +0000