aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-11-10 00:49:50 +0000
committerMDN <actions@users.noreply.github.com>2021-11-10 00:49:50 +0000
commitd10da93ad3a7b0ffff88aa57b197b65d6f234018 (patch)
treecbc1dd3284731a8171de16252ac8e79e267fc6e6 /files/zh-cn
parent41db9519592a8c29c6ab0864a0ccfff9c8fdce6f (diff)
downloadtranslated-content-d10da93ad3a7b0ffff88aa57b197b65d6f234018.tar.gz
translated-content-d10da93ad3a7b0ffff88aa57b197b65d6f234018.tar.bz2
translated-content-d10da93ad3a7b0ffff88aa57b197b65d6f234018.zip
[CRON] sync translated content
Diffstat (limited to 'files/zh-cn')
-rw-r--r--files/zh-cn/_redirects.txt5
-rw-r--r--files/zh-cn/_wikihistory.json16
-rw-r--r--files/zh-cn/conflicting/web/css/cursor/index.html (renamed from files/zh-cn/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html)4
3 files changed, 13 insertions, 12 deletions
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index c556ba1986..5c69868bdc 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -82,7 +82,7 @@
/zh-CN/docs/CSS/calc /zh-CN/docs/Web/CSS/calc()
/zh-CN/docs/CSS/clip /zh-CN/docs/Web/CSS/clip
/zh-CN/docs/CSS/cursor /zh-CN/docs/Web/CSS/cursor
-/zh-CN/docs/CSS/cursor/url /zh-CN/docs/Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property
+/zh-CN/docs/CSS/cursor/url /zh-CN/docs/conflicting/Web/CSS/cursor
/zh-CN/docs/CSS/display /zh-CN/docs/Web/CSS/display
/zh-CN/docs/CSS/flex-grow /zh-CN/docs/Web/CSS/flex-grow
/zh-CN/docs/CSS/float /zh-CN/docs/Web/CSS/float
@@ -1715,6 +1715,7 @@
/zh-CN/docs/Web/CSS/CSS_Background_and_Borders/Box-shadow_generator /zh-CN/docs/Web/CSS/CSS_Backgrounds_and_Borders/Box-shadow_generator
/zh-CN/docs/Web/CSS/CSS_Background_and_Borders/圆角边框发生器 /zh-CN/docs/Web/CSS/CSS_Backgrounds_and_Borders/Border-radius_generator
/zh-CN/docs/Web/CSS/CSS_Backgrounds_and_Borders/Scaling_background_images /zh-CN/docs/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images
+/zh-CN/docs/Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property /zh-CN/docs/conflicting/Web/CSS/cursor
/zh-CN/docs/Web/CSS/CSS_Box_Model/Box-shadow_generator /zh-CN/docs/Web/CSS/CSS_Backgrounds_and_Borders/Box-shadow_generator
/zh-CN/docs/Web/CSS/CSS_Flexible_Box_Layout/Flexbox_的_向下_支持 /zh-CN/docs/Web/CSS/CSS_Flexible_Box_Layout/Backwards_Compatibility_of_Flexbox
/zh-CN/docs/Web/CSS/CSS_Flexible_Box_Layout/典型_用例_的_Flexbox /zh-CN/docs/Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox
@@ -1752,7 +1753,7 @@
/zh-CN/docs/Web/CSS/clamp /zh-CN/docs/Web/CSS/clamp()
/zh-CN/docs/Web/CSS/counter /zh-CN/docs/Web/CSS/counter()
/zh-CN/docs/Web/CSS/counters /zh-CN/docs/Web/CSS/counters()
-/zh-CN/docs/Web/CSS/cursor/url /zh-CN/docs/Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property
+/zh-CN/docs/Web/CSS/cursor/url /zh-CN/docs/conflicting/Web/CSS/cursor
/zh-CN/docs/Web/CSS/element /zh-CN/docs/Web/CSS/element()
/zh-CN/docs/Web/CSS/env /zh-CN/docs/Web/CSS/env()
/zh-CN/docs/Web/CSS/filter-function/blur /zh-CN/docs/Web/CSS/filter-function/blur()
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index f3ae0618d0..88c5dd775d 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -26023,14 +26023,6 @@
"namklaw"
]
},
- "Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property": {
- "modified": "2019-03-23T23:32:59.999Z",
- "contributors": [
- "xgqfrms-GitHub",
- "teoli",
- "ziyunfei"
- ]
- },
"Web/CSS/CSS_Box_Alignment": {
"modified": "2020-02-11T06:02:03.390Z",
"contributors": [
@@ -47516,6 +47508,14 @@
"Chajn"
]
},
+ "conflicting/Web/CSS/cursor": {
+ "modified": "2019-03-23T23:32:59.999Z",
+ "contributors": [
+ "xgqfrms-GitHub",
+ "teoli",
+ "ziyunfei"
+ ]
+ },
"conflicting/Web/CSS/easing-function": {
"modified": "2020-10-15T21:21:10.131Z",
"contributors": [
diff --git a/files/zh-cn/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html b/files/zh-cn/conflicting/web/css/cursor/index.html
index e77cea2ec5..fe2630c599 100644
--- a/files/zh-cn/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html
+++ b/files/zh-cn/conflicting/web/css/cursor/index.html
@@ -1,11 +1,11 @@
---
title: Using URL values for the cursor property
-slug: Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property
+slug: conflicting/Web/CSS/cursor
tags:
- Cursor
- URL
translation_of: Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property
-original_slug: Web/CSS/cursor/url
+original_slug: Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property
---
<p><a href="/zh-CN/docs/Gecko">Gecko</a> 1.8 (Firefox 1.5,SeaMonkey 1.0) 支持CSS的URL值 {{cssxref("cursor")}} 属性在Windows和Linux。Mac支持是在Gecko 2(Firefox 4)中添加的。这允许将任意图像指定为鼠标光标 - 可以使用Gecko支持的任何图像格式。</p>