zh-cn: sync translated content

mdn · Jun 28, 2023 · 915eb00 · 915eb00
1 parent 77c67d2
commit 915eb00
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
@@ -2663,6 +2663,7 @@
 /zh-CN/docs/Web/Progressive_web_apps/Offline_Service_workers	/zh-CN/docs/Web/Progressive_web_apps/Tutorials/js13kGames/Offline_Service_workers
 /zh-CN/docs/Web/Progressive_web_apps/Re-engageable_Notifications_Push	/zh-CN/docs/Web/Progressive_web_apps/Tutorials/js13kGames/Re-engageable_Notifications_Push
 /zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types	/zh-CN/docs/Web/CSS/CSS_media_queries/Using_media_queries
+/zh-CN/docs/Web/Progressive_web_apps/Responsive/responsive_design_building_blocks	/zh-CN/docs/conflicting/Learn/CSS/CSS_layout/Responsive_Design
 /zh-CN/docs/Web/Progressive_web_apps/加载	/zh-CN/docs/Web/Progressive_web_apps/Tutorials/js13kGames/Loading
 /zh-CN/docs/Web/Progressive_web_apps/添加到主屏幕	/zh-CN/docs/Web/Progressive_web_apps/Guides/Making_PWAs_installable
 /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
@@ -32180,10 +32180,6 @@
     "modified": "2019-11-13T02:27:54.714Z",
     "contributors": ["JC-Ge"]
   },
-  "Web/Progressive_web_apps/Responsive/responsive_design_building_blocks": {
-    "modified": "2020-11-17T04:04:41.165Z",
-    "contributors": ["DingGuangbo"]
-  },
   "Web/Progressive_web_apps/Tutorials/js13kGames/App_structure": {
     "modified": "2020-05-31T18:38:01.454Z",
     "contributors": [
@@ -33510,5 +33506,9 @@
       "skyfore",
       "xgqfrms-GitHub"
     ]
+  },
+  "conflicting/Learn/CSS/CSS_layout/Responsive_Design": {
+    "modified": "2020-11-17T04:04:41.165Z",
+    "contributors": ["DingGuangbo"]
   }
 }
diff --git a/...esponsive_design_building_blocks/index.md → ...css/css_layout/responsive_design/index.md b/...esponsive_design_building_blocks/index.md → ...css/css_layout/responsive_design/index.md
@@ -1,6 +1,7 @@
 ---
 title: 响应式设计的基础
-slug: Web/Progressive_web_apps/Responsive/responsive_design_building_blocks
+slug: conflicting/Learn/CSS/CSS_layout/Responsive_Design
+original_slug: Web/Progressive_web_apps/Responsive/responsive_design_building_blocks
 ---
 
 在本文中，我们将讨论响应式设计的主要基本组成部分，并在必要时提供一些指向更多信息的链接。