aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn/conflicting/web/css
diff options
context:
space:
mode:
authorFlorian Merz <me@fiji-flo.de>2021-02-11 12:56:53 +0100
committerFlorian Merz <me@fiji-flo.de>2021-02-11 12:56:53 +0100
commitfc56124ac4eda6b3f0349c8a16fa750f27b4c7d6 (patch)
tree7089f49c5dcc5428f29711439ab79ac387caf44f /files/zh-cn/conflicting/web/css
parent310fd066e91f454b990372ffa30e803cc8120975 (diff)
downloadtranslated-content-fc56124ac4eda6b3f0349c8a16fa750f27b4c7d6.tar.gz
translated-content-fc56124ac4eda6b3f0349c8a16fa750f27b4c7d6.tar.bz2
translated-content-fc56124ac4eda6b3f0349c8a16fa750f27b4c7d6.zip
unslug zh-cn: modify
Diffstat (limited to 'files/zh-cn/conflicting/web/css')
-rw-r--r--files/zh-cn/conflicting/web/css/@viewport/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/_colon_is/index.html7
-rw-r--r--files/zh-cn/conflicting/web/css/_colon_placeholder-shown/index.html7
-rw-r--r--files/zh-cn/conflicting/web/css/_doublecolon_placeholder/index.html7
-rw-r--r--files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/css_color/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html3
-rw-r--r--files/zh-cn/conflicting/web/css/easing-function/index.html3
16 files changed, 38 insertions, 22 deletions
diff --git a/files/zh-cn/conflicting/web/css/@viewport/index.html b/files/zh-cn/conflicting/web/css/@viewport/index.html
index 92d33a292c..5932c8d574 100644
--- a/files/zh-cn/conflicting/web/css/@viewport/index.html
+++ b/files/zh-cn/conflicting/web/css/@viewport/index.html
@@ -1,8 +1,9 @@
---
title: height
-slug: Web/CSS/@viewport/height
+slug: conflicting/Web/CSS/@viewport
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/height
+original_slug: Web/CSS/@viewport/height
---
<div>{{CSSRef}}</div>
diff --git a/files/zh-cn/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html b/files/zh-cn/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html
index 11519cee6e..eac64dabdb 100644
--- a/files/zh-cn/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html
+++ b/files/zh-cn/conflicting/web/css/@viewport_7861ca3461a359b150d44f2c8d74e53a/index.html
@@ -1,11 +1,12 @@
---
title: orientation
-slug: Web/CSS/@viewport/orientation
+slug: conflicting/Web/CSS/@viewport_7861ca3461a359b150d44f2c8d74e53a
tags:
- CSS
- CSS Description
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/orientation
+original_slug: Web/CSS/@viewport/orientation
---
<div>{{CSSRef}}</div>
diff --git a/files/zh-cn/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html b/files/zh-cn/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html
index 2716ef1d6f..8798295f4b 100644
--- a/files/zh-cn/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html
+++ b/files/zh-cn/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html
@@ -1,8 +1,9 @@
---
title: viewport-fit
-slug: Web/CSS/@viewport/viewport-fit
+slug: conflicting/Web/CSS/@viewport_a33ee59ffd8336ffb3336900dea02e9f
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/viewport-fit
+original_slug: Web/CSS/@viewport/viewport-fit
---
<div>{{CSSRef}} {{Draft}} {{SeeCompatTable}}</div>
diff --git a/files/zh-cn/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html b/files/zh-cn/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
index ed5c585a7e..709a42b3d1 100644
--- a/files/zh-cn/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
+++ b/files/zh-cn/conflicting/web/css/@viewport_c925ec0506b352ea1185248b874f7848/index.html
@@ -1,8 +1,9 @@
---
title: width
-slug: Web/CSS/@viewport/width
+slug: conflicting/Web/CSS/@viewport_c925ec0506b352ea1185248b874f7848
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/width
+original_slug: Web/CSS/@viewport/width
---
<div>{{CSSRef}}</div>
diff --git a/files/zh-cn/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html b/files/zh-cn/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html
index 894e8a6c73..0e9cc815ec 100644
--- a/files/zh-cn/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html
+++ b/files/zh-cn/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html
@@ -1,11 +1,12 @@
---
title: zoom
-slug: Web/CSS/@viewport/zoom
+slug: conflicting/Web/CSS/@viewport_e065ce90bde08c9679692adbe64f6518
tags:
- CSS
- CSS Descriptor
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/zoom
+original_slug: Web/CSS/@viewport/zoom
---
<div>{{ CSSRef }}</div>
diff --git a/files/zh-cn/conflicting/web/css/_colon_is/index.html b/files/zh-cn/conflicting/web/css/_colon_is/index.html
index e9f8527a79..4665363416 100644
--- a/files/zh-cn/conflicting/web/css/_colon_is/index.html
+++ b/files/zh-cn/conflicting/web/css/_colon_is/index.html
@@ -1,12 +1,13 @@
---
title: ':any'
-slug: 'Web/CSS/:any'
+slug: conflicting/Web/CSS/:is
tags:
- CSS
- 伪类选择器
- 实验性
-translation_of: 'Web/CSS/:is'
-translation_of_original: 'Web/CSS/:any'
+translation_of: Web/CSS/:is
+translation_of_original: Web/CSS/:any
+original_slug: Web/CSS/:any
---
<div>{{CSSRef}}{{SeeCompatTable}}</div>
diff --git a/files/zh-cn/conflicting/web/css/_colon_placeholder-shown/index.html b/files/zh-cn/conflicting/web/css/_colon_placeholder-shown/index.html
index f7493e4757..af8a706fa9 100644
--- a/files/zh-cn/conflicting/web/css/_colon_placeholder-shown/index.html
+++ b/files/zh-cn/conflicting/web/css/_colon_placeholder-shown/index.html
@@ -1,13 +1,14 @@
---
title: ':-moz-placeholder'
-slug: 'Web/CSS/:-moz-placeholder'
+slug: conflicting/Web/CSS/:placeholder-shown
tags:
- CSS
- CSS Pseudo-class
- CSS Reference
- Non-standard
-translation_of: 'Web/CSS/:placeholder-shown'
-translation_of_original: 'Web/CSS/:-moz-placeholder'
+translation_of: Web/CSS/:placeholder-shown
+translation_of_original: Web/CSS/:-moz-placeholder
+original_slug: Web/CSS/:-moz-placeholder
---
<p> </p>
diff --git a/files/zh-cn/conflicting/web/css/_doublecolon_placeholder/index.html b/files/zh-cn/conflicting/web/css/_doublecolon_placeholder/index.html
index 3c08f433c8..b66dc3a6ef 100644
--- a/files/zh-cn/conflicting/web/css/_doublecolon_placeholder/index.html
+++ b/files/zh-cn/conflicting/web/css/_doublecolon_placeholder/index.html
@@ -1,13 +1,14 @@
---
title: '::-moz-placeholder'
-slug: 'Web/CSS/::-moz-placeholder'
+slug: conflicting/Web/CSS/::placeholder
tags:
- CSS
- CSS Pseudo-class
- CSS Reference
- Non-standard
-translation_of: 'Web/CSS/::placeholder'
-translation_of_original: 'Web/CSS/::-moz-placeholder'
+translation_of: Web/CSS/::placeholder
+translation_of_original: Web/CSS/::-moz-placeholder
+original_slug: Web/CSS/::-moz-placeholder
---
<div>{{Non-standard_header}}{{CSSRef}}</div>
diff --git a/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/index.html b/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/index.html
index 96d540eedd..8fe764c269 100644
--- a/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/index.html
+++ b/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/index.html
@@ -1,6 +1,6 @@
---
title: CSS Background and Borders
-slug: Web/CSS/CSS_Background_and_Borders
+slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders
tags:
- CSS
- CSS Backgrounds and Borders
@@ -10,6 +10,7 @@ tags:
- TopicStub
translation_of: Web/CSS/CSS_Backgrounds_and_Borders
translation_of_original: Web/CSS/CSS_Background_and_Borders
+original_slug: Web/CSS/CSS_Background_and_Borders
---
<p>{{CSSRef}}</p>
diff --git a/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html b/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html
index 611a58af85..8d64addd68 100644
--- a/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html
+++ b/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html
@@ -1,6 +1,6 @@
---
title: 缩放背景图像
-slug: Web/Guide/CSS/Scaling_background_images
+slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images
tags:
- Advanced
- CSS
@@ -11,6 +11,7 @@ tags:
- 背景图片
translation_of: Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images
translation_of_original: Web/CSS/CSS_Background_and_Borders/Scaling_background_images
+original_slug: Web/Guide/CSS/Scaling_background_images
---
<div>{{cssref}}</div>
diff --git a/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html b/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html
index 66cd1921d5..b1d5ee045e 100644
--- a/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html
+++ b/files/zh-cn/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html
@@ -1,6 +1,6 @@
---
title: 使用CSS的多背景
-slug: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds
+slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds
tags:
- CSS
- CSS Background
@@ -9,6 +9,7 @@ tags:
- Intermediate
translation_of: Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds
translation_of_original: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds
+original_slug: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds
---
<p>{{CSSRef}}</p>
diff --git a/files/zh-cn/conflicting/web/css/css_color/index.html b/files/zh-cn/conflicting/web/css/css_color/index.html
index 60036fea2b..65153a61df 100644
--- a/files/zh-cn/conflicting/web/css/css_color/index.html
+++ b/files/zh-cn/conflicting/web/css/css_color/index.html
@@ -1,6 +1,6 @@
---
title: CSS Colors
-slug: Web/CSS/CSS_Colors
+slug: conflicting/Web/CSS/CSS_Color
tags:
- CSS
- CSS Colors
@@ -10,6 +10,7 @@ tags:
- TopicStub
translation_of: Web/CSS/CSS_Color
translation_of_original: Web/CSS/CSS_Colors
+original_slug: Web/CSS/CSS_Colors
---
<div>{{CSSRef}}</div>
diff --git a/files/zh-cn/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html b/files/zh-cn/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html
index d2054bc725..64120aad99 100644
--- a/files/zh-cn/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html
+++ b/files/zh-cn/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html
@@ -1,6 +1,6 @@
---
title: 使用弹性盒子进行高级布局
-slug: Web/CSS/CSS_Flexible_Box_Layout/Mixins
+slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Backwards_Compatibility_of_Flexbox
tags:
- CSS3布局模型
- Flexible_Box
@@ -9,6 +9,7 @@ tags:
- 弹性盒子
- 弹性盒子模型
translation_of: Web/CSS/CSS_Flexible_Box_Layout/Mixins
+original_slug: Web/CSS/CSS_Flexible_Box_Layout/Mixins
---
<p>使用弹性盒子的意义是在任何尺寸的屏幕上改变其和其子元素的尺寸填充屏幕可用空间。一个弹性框容器将延展它的子元素以填充可用空间,并且缩小它的子元素来避免溢出。</p>
diff --git a/files/zh-cn/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html b/files/zh-cn/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
index d50cf7582f..5a26114225 100644
--- a/files/zh-cn/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
+++ b/files/zh-cn/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
@@ -1,6 +1,6 @@
---
title: 使用 CSS 弹性盒子
-slug: Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes
+slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox
tags:
- CSS
- CSS Flexible Boxes
@@ -17,6 +17,7 @@ tags:
- 进阶
translation_of: Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox
translation_of_original: Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes
+original_slug: Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes
---
<div>{{CSSRef}}</div>
diff --git a/files/zh-cn/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html b/files/zh-cn/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
index 9ea8045d96..416b96e007 100644
--- a/files/zh-cn/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
+++ b/files/zh-cn/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html
@@ -1,11 +1,12 @@
---
title: 使用flexbox来布局web应用
-slug: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications
+slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox
tags:
- CSS
- 弹性盒子
translation_of: Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox
translation_of_original: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications
+original_slug: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications
---
<p>{{CSSRef}}</p>
diff --git a/files/zh-cn/conflicting/web/css/easing-function/index.html b/files/zh-cn/conflicting/web/css/easing-function/index.html
index aef640fdd3..1e53f47c6d 100644
--- a/files/zh-cn/conflicting/web/css/easing-function/index.html
+++ b/files/zh-cn/conflicting/web/css/easing-function/index.html
@@ -1,11 +1,12 @@
---
title: <timing-function>
-slug: Web/CSS/timing-function
+slug: conflicting/Web/CSS/easing-function
tags:
- CSS
- timing-function
translation_of: Web/CSS/easing-function
translation_of_original: Web/CSS/timing-function
+original_slug: Web/CSS/timing-function
---
<p>{{ CSSRef() }}</p>