aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-09-02 00:46:31 +0000
committerMDN <actions@users.noreply.github.com>2021-09-02 00:46:31 +0000
commitdda635dd6182e36ba9ac07810014cf15cf47e50a (patch)
tree8709a9561fbbd4b8980c519ed18a7f23d0560572 /files/zh-cn
parent7f3490a71d7ce7251f6d59fd07e0f300cc8737a3 (diff)
downloadtranslated-content-dda635dd6182e36ba9ac07810014cf15cf47e50a.tar.gz
translated-content-dda635dd6182e36ba9ac07810014cf15cf47e50a.tar.bz2
translated-content-dda635dd6182e36ba9ac07810014cf15cf47e50a.zip
[CRON] sync translated content
Diffstat (limited to 'files/zh-cn')
-rw-r--r--files/zh-cn/_redirects.txt1
-rw-r--r--files/zh-cn/_wikihistory.json20
-rw-r--r--files/zh-cn/conflicting/web/css/index.html (renamed from files/zh-cn/web/css/tools/index.html)3
3 files changed, 13 insertions, 11 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index f625f0a1c0..c9a3dcc7c3 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1714,6 +1714,7 @@
/zh-CN/docs/Web/CSS/Reference/Webkit_Extensions /zh-CN/docs/Web/CSS/WebKit_Extensions
/zh-CN/docs/Web/CSS/Reference/background-blend-mode /zh-CN/docs/Web/CSS/background-blend-mode
/zh-CN/docs/Web/CSS/Reference/mix-blend-mode /zh-CN/docs/Web/CSS/mix-blend-mode
+/zh-CN/docs/Web/CSS/Tools /zh-CN/docs/conflicting/Web/CSS
/zh-CN/docs/Web/CSS/Tutorials/Using_CSS_transforms /zh-CN/docs/Web/CSS/CSS_Transforms/Using_CSS_transforms
/zh-CN/docs/Web/CSS/Understanding_z-index /zh-CN/docs/Web/CSS/CSS_Positioning/Understanding_z_index
/zh-CN/docs/Web/CSS/Understanding_z-index/Adding_z-index /zh-CN/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Adding_z-index
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index f4f8937676..3e599cf40f 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -27262,16 +27262,6 @@
"yan"
]
},
- "Web/CSS/Tools": {
- "modified": "2019-03-23T22:29:45.280Z",
- "contributors": [
- "runyul",
- "pluwen",
- "edwards1101",
- "lucia007",
- "lunix01"
- ]
- },
"Web/CSS/Tutorials": {
"modified": "2019-03-23T23:32:32.218Z",
"contributors": [
@@ -47394,6 +47384,16 @@
"qianzhangcheng"
]
},
+ "conflicting/Web/CSS": {
+ "modified": "2019-03-23T22:29:45.280Z",
+ "contributors": [
+ "runyul",
+ "pluwen",
+ "edwards1101",
+ "lucia007",
+ "lunix01"
+ ]
+ },
"conflicting/Web/CSS/::placeholder": {
"modified": "2019-03-23T23:21:18.757Z",
"contributors": [
diff --git a/files/zh-cn/web/css/tools/index.html b/files/zh-cn/conflicting/web/css/index.html
index a4c348fb36..007a716edb 100644
--- a/files/zh-cn/web/css/tools/index.html
+++ b/files/zh-cn/conflicting/web/css/index.html
@@ -1,9 +1,10 @@
---
title: 工具
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS
tags:
- CSS
translation_of: Web/CSS/Tools
+original_slug: Web/CSS/Tools
---
<div>CSS提供了许多强大的功能,但这些功能要么可能很难使用,要么有许多参数,因此在使用它们时,能够可视化它们是有帮助的。此页面提供了一些有用的工具的链接,这些工具将帮助您使用这些功能构建 CSS 来设计您的内容。</div>