aboutsummaryrefslogtreecommitdiff
path: root/files/ru/conflicting/web/css
diff options
context:
space:
mode:
Diffstat (limited to 'files/ru/conflicting/web/css')
-rw-r--r--files/ru/conflicting/web/css/@viewport/index.html3
-rw-r--r--files/ru/conflicting/web/css/_colon_is/index.html7
-rw-r--r--files/ru/conflicting/web/css/css_basic_user_interface/index.html3
-rw-r--r--files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html3
-rw-r--r--files/ru/conflicting/web/css/gap/index.html3
-rw-r--r--files/ru/conflicting/web/css/url()/index.html3
-rw-r--r--files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html3
7 files changed, 16 insertions, 9 deletions
diff --git a/files/ru/conflicting/web/css/@viewport/index.html b/files/ru/conflicting/web/css/@viewport/index.html
index 3cb5768532..6778691ba7 100644
--- a/files/ru/conflicting/web/css/@viewport/index.html
+++ b/files/ru/conflicting/web/css/@viewport/index.html
@@ -1,8 +1,9 @@
---
title: user-zoom
-slug: Web/CSS/@viewport/user-zoom
+slug: conflicting/Web/CSS/@viewport
translation_of: Web/CSS/@viewport
translation_of_original: Web/CSS/@viewport/user-zoom
+original_slug: Web/CSS/@viewport/user-zoom
---
<div>{{ CSSRef }}</div>
diff --git a/files/ru/conflicting/web/css/_colon_is/index.html b/files/ru/conflicting/web/css/_colon_is/index.html
index 6a9dab56ac..d2ed013366 100644
--- a/files/ru/conflicting/web/css/_colon_is/index.html
+++ b/files/ru/conflicting/web/css/_colon_is/index.html
@@ -1,14 +1,15 @@
---
title: ':any'
-slug: 'Web/CSS/:any'
+slug: conflicting/Web/CSS/:is
tags:
- CSS
- Experimental
- Псевдоклассы
- Руководство
- Экспериментальное
-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/ru/conflicting/web/css/css_basic_user_interface/index.html b/files/ru/conflicting/web/css/css_basic_user_interface/index.html
index 2a4028644d..3a739dcff4 100644
--- a/files/ru/conflicting/web/css/css_basic_user_interface/index.html
+++ b/files/ru/conflicting/web/css/css_basic_user_interface/index.html
@@ -1,6 +1,6 @@
---
title: CSS Basic User Interface
-slug: Web/CSS/CSS_User_Interface
+slug: conflicting/Web/CSS/CSS_Basic_User_Interface
tags:
- CSS
- CSS Basic User Interface
@@ -10,6 +10,7 @@ tags:
- TopicStub
translation_of: Web/CSS/CSS_Basic_User_Interface
translation_of_original: Web/CSS/CSS_User_Interface
+original_slug: Web/CSS/CSS_User_Interface
---
<div>{{CSSRef}}</div>
diff --git a/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html b/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
index 3f0b229d20..e40fb04a90 100644
--- a/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
+++ b/files/ru/conflicting/web/css/css_flexible_box_layout/basic_concepts_of_flexbox/index.html
@@ -1,8 +1,9 @@
---
title: Используем CSS Flexible Boxes
-slug: Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes
+slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox
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>Эта статья устарела и удалена из английской версии. Вместо неё идёт перенаправление на статью:
<h1 id="Основные_понятия_Flexbox"><a href="https://developer.mozilla.org/ru/docs/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox">Основные понятия Flexbox</a></h1>
diff --git a/files/ru/conflicting/web/css/gap/index.html b/files/ru/conflicting/web/css/gap/index.html
index 90daa7c0ea..bc37f159e8 100644
--- a/files/ru/conflicting/web/css/gap/index.html
+++ b/files/ru/conflicting/web/css/gap/index.html
@@ -1,8 +1,9 @@
---
title: grid-gap
-slug: Web/CSS/grid-gap
+slug: conflicting/Web/CSS/gap
translation_of: Web/CSS/gap
translation_of_original: Web/CSS/grid-gap
+original_slug: Web/CSS/grid-gap
---
<p>{{Deprecated_Header}}</p>
diff --git a/files/ru/conflicting/web/css/url()/index.html b/files/ru/conflicting/web/css/url()/index.html
index 755d1adfe4..abbc8af65a 100644
--- a/files/ru/conflicting/web/css/url()/index.html
+++ b/files/ru/conflicting/web/css/url()/index.html
@@ -1,6 +1,6 @@
---
title: url()
-slug: Web/CSS/filter-function/url
+slug: conflicting/Web/CSS/url()
tags:
- CSS
- Начинающий
@@ -8,6 +8,7 @@ tags:
- Функция
translation_of: Web/CSS/url()
translation_of_original: Web/CSS/filter-function/url
+original_slug: Web/CSS/filter-function/url
---
<div>{{cssref}}</div>
diff --git a/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html b/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html
index 82965bf827..c3184e46fa 100644
--- a/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html
+++ b/files/ru/conflicting/web/css/url()_168028c4e5edd9e19c061adb4b604d4f/index.html
@@ -1,12 +1,13 @@
---
title: <url>
-slug: Web/CSS/url
+slug: conflicting/Web/CSS/url()_168028c4e5edd9e19c061adb4b604d4f
tags:
- Адрес
- Типы данных
- относительный адрес
translation_of: Web/CSS/url()
translation_of_original: Web/CSS/url
+original_slug: Web/CSS/url
---
<div>{{CssRef}}</div>