diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt index ed1788fb51da90..d4acf1d4d211ae 100644 --- a/files/ru/_redirects.txt +++ b/files/ru/_redirects.txt @@ -15,7 +15,7 @@ /ru/docs/CSS/background-repeat /ru/docs/Web/CSS/background-repeat /ru/docs/CSS/display /ru/docs/Web/CSS/display /ru/docs/CSS/float /ru/docs/Web/CSS/float -/ru/docs/CSS/Синтаксис /ru/docs/Web/CSS/Syntax +/ru/docs/CSS/Синтаксис /ru/docs/Web/CSS/CSS_syntax/Syntax /ru/docs/Core_JavaScript_1.5_Reference /ru/docs/Web/JavaScript/Reference /ru/docs/Core_JavaScript_1.5_Reference/Functions /ru/docs/Web/JavaScript/Guide/Functions /ru/docs/Core_JavaScript_1.5_Reference/Global_Functions /ru/docs/Web/JavaScript/Reference/Global_Objects @@ -687,6 +687,7 @@ /ru/docs/Web/API/WebRTC_API/Taking_still_photos /ru/docs/Web/API/Media_Capture_and_Streams_API/Taking_still_photos /ru/docs/Web/API/WebRTC_API/протоколы /ru/docs/Web/API/WebRTC_API/Protocols /ru/docs/Web/API/WebRTC_API/связь /ru/docs/Web/API/WebRTC_API/Connectivity +/ru/docs/Web/API/Window/console /ru/docs/conflicting/Web/API/console /ru/docs/Web/API/Window/mozAnimationStartTime /ru/docs/Web/API/Animation/startTime /ru/docs/Web/API/WindowBase64/Base64_encoding_and_decoding /ru/docs/Glossary/Base64 /ru/docs/Web/API/WindowBase64/btoa /ru/docs/Web/API/Window/btoa @@ -757,6 +758,7 @@ /ru/docs/Web/CSS/@viewport/zoom /ru/docs/Web/CSS /ru/docs/Web/CSS/Adjacent_sibling_combinator /ru/docs/Web/CSS/Next-sibling_combinator /ru/docs/Web/CSS/Adjacent_sibling_selectors /ru/docs/Web/CSS/Next-sibling_combinator +/ru/docs/Web/CSS/At-rule /ru/docs/Web/CSS/CSS_syntax/At-rule /ru/docs/Web/CSS/CSS_Animations/Ispolzovanie_CSS_animatciy /ru/docs/Web/CSS/CSS_animations/Using_CSS_animations /ru/docs/Web/CSS/CSS_Background_and_Borders/Border-image_generator /ru/docs/Web/CSS/CSS_backgrounds_and_borders/Border-image_generator /ru/docs/Web/CSS/CSS_Background_and_Borders/Border-radius_generator /ru/docs/Web/CSS/CSS_backgrounds_and_borders/Border-radius_generator @@ -785,6 +787,7 @@ /ru/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Stacking_without_z-index /ru/docs/Web/CSS/CSS_positioned_layout/Understanding_z-index/Stacking_without_z-index /ru/docs/Web/CSS/CSS_Positioning/Understanding_z_index/The_stacking_context /ru/docs/Web/CSS/CSS_positioned_layout/Understanding_z-index/Stacking_context /ru/docs/Web/CSS/CSS_Ruby /ru/docs/Web/CSS/CSS_ruby_layout +/ru/docs/Web/CSS/CSS_Types /ru/docs/Web/CSS/CSS_Values_and_Units/CSS_data_types /ru/docs/Web/CSS/CSS_Variables /ru/docs/Web/CSS/CSS_cascading_variables /ru/docs/Web/CSS/CSS_animated_properties /ru/docs/Web/CSS /ru/docs/Web/CSS/CSS_animations/Tips /ru/docs/Web/API/Web_Animations_API/Tips @@ -793,11 +796,13 @@ /ru/docs/Web/CSS/CSS_Селекторы /ru/docs/Web/CSS/CSS_selectors /ru/docs/Web/CSS/CSS_Селекторы/Using_the_:target_pseudo-class_in_selectors /ru/docs/Web/CSS/CSS_selectors/Using_the_:target_pseudo-class_in_selectors /ru/docs/Web/CSS/Child_selectors /ru/docs/Web/CSS/Child_combinator +/ru/docs/Web/CSS/Comments /ru/docs/Web/CSS/CSS_syntax/Comments /ru/docs/Web/CSS/Common_CSS_Questions /ru/docs/Learn_web_development/Howto/Solve_CSS_problems/CSS_FAQ /ru/docs/Web/CSS/Containing_block /ru/docs/Web/CSS/CSS_display/Containing_block /ru/docs/Web/CSS/Descendant_selectors /ru/docs/Web/CSS/Descendant_combinator /ru/docs/Web/CSS/General_sibling_combinator /ru/docs/Web/CSS/Subsequent-sibling_combinator /ru/docs/Web/CSS/General_sibling_selectors /ru/docs/Web/CSS/Subsequent-sibling_combinator +/ru/docs/Web/CSS/Inheritance /ru/docs/Web/CSS/CSS_cascade/Inheritance /ru/docs/Web/CSS/Media_Queries /ru/docs/Web/CSS/CSS_media_queries /ru/docs/Web/CSS/Media_Queries/Testing_media_queries /ru/docs/Web/CSS/CSS_media_queries/Testing_media_queries /ru/docs/Web/CSS/Media_Queries/Using_media_queries /ru/docs/Web/CSS/CSS_media_queries/Using_media_queries @@ -805,26 +810,32 @@ /ru/docs/Web/CSS/Paged_Media /ru/docs/Web/CSS/CSS_paged_media /ru/docs/Web/CSS/Reference/background-blend-mode /ru/docs/Web/CSS/background-blend-mode /ru/docs/Web/CSS/Specificity /ru/docs/Web/CSS/CSS_cascade/Specificity +/ru/docs/Web/CSS/Syntax /ru/docs/Web/CSS/CSS_syntax/Syntax /ru/docs/Web/CSS/Using_CSS_custom_properties /ru/docs/Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties /ru/docs/Web/CSS/Using_CSS_variables /ru/docs/Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties +/ru/docs/Web/CSS/actual_value /ru/docs/Web/CSS/CSS_cascade/actual_value /ru/docs/Web/CSS/attr() /ru/docs/Web/CSS/attr /ru/docs/Web/CSS/box_model /ru/docs/Web/CSS/CSS_box_model/Introduction_to_the_CSS_box_model /ru/docs/Web/CSS/calc() /ru/docs/Web/CSS/calc /ru/docs/Web/CSS/clamp() /ru/docs/Web/CSS/clamp +/ru/docs/Web/CSS/computed_value /ru/docs/Web/CSS/CSS_cascade/computed_value /ru/docs/Web/CSS/filter-function/blur() /ru/docs/Web/CSS/filter-function/blur +/ru/docs/Web/CSS/initial_value /ru/docs/Web/CSS/CSS_cascade/initial_value /ru/docs/Web/CSS/minmax() /ru/docs/Web/CSS/minmax +/ru/docs/Web/CSS/specified_value /ru/docs/Web/CSS/CSS_cascade/specified_value /ru/docs/Web/CSS/transform-function/rotate() /ru/docs/Web/CSS/transform-function/rotate /ru/docs/Web/CSS/transform-function/rotate3d() /ru/docs/Web/CSS/transform-function/rotate3d /ru/docs/Web/CSS/transform-function/scale3d() /ru/docs/Web/CSS/transform-function/scale3d /ru/docs/Web/CSS/transform-function/skew() /ru/docs/Web/CSS/transform-function/skew +/ru/docs/Web/CSS/used_value /ru/docs/Web/CSS/CSS_cascade/used_value /ru/docs/Web/CSS/var() /ru/docs/Web/CSS/var -/ru/docs/Web/CSS/Действительное_значение /ru/docs/Web/CSS/actual_value +/ru/docs/Web/CSS/Действительное_значение /ru/docs/Web/CSS/CSS_cascade/actual_value /ru/docs/Web/CSS/Замещаемый_элемент /ru/docs/Web/CSS/Replaced_element /ru/docs/Web/CSS/Псевдо-классы /ru/docs/Web/CSS/Pseudo-classes -/ru/docs/Web/CSS/Синтаксис /ru/docs/Web/CSS/Syntax +/ru/docs/Web/CSS/Синтаксис /ru/docs/Web/CSS/CSS_syntax/Syntax /ru/docs/Web/CSS/Способ_расположения /ru/docs/Web/CSS/Layout_mode -/ru/docs/Web/CSS/Тихий /ru/docs/Web/CSS/Comments -/ru/docs/Web/CSS/Указанное_значение /ru/docs/Web/CSS/specified_value +/ru/docs/Web/CSS/Тихий /ru/docs/Web/CSS/CSS_syntax/Comments +/ru/docs/Web/CSS/Указанное_значение /ru/docs/Web/CSS/CSS_cascade/specified_value /ru/docs/Web/CSS/размер /ru/docs/Web/CSS/length /ru/docs/Web/Events/abort_(dom_abort_api) /ru/docs/Web/API/AbortSignal/abort_event /ru/docs/Web/Events/blur /ru/docs/Web/API/Element/blur_event diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json index c4548c4eaa64b2..11ac962417292d 100644 --- a/files/ru/_wikihistory.json +++ b/files/ru/_wikihistory.json @@ -9817,12 +9817,6 @@ "ahtohbi4" ] }, - "Web/API/Window/console": { - "modified": "2019-03-18T21:20:36.516Z", - "contributors": [ - "AndreiSoroka" - ] - }, "Web/API/Window/crypto": { "modified": "2019-03-23T22:55:57.909Z", "contributors": [ @@ -11306,20 +11300,13 @@ "andreww2012" ] }, - "Web/CSS/At-rule": { - "modified": "2019-11-07T14:56:39.596Z", - "contributors": [ - "sashakrauzer", - "JokerHD" - ] - }, "Web/CSS/Attribute_selectors": { "modified": "2019-03-23T22:55:54.351Z", "contributors": [ "surrsoft" ] }, - "Web/CSS/CSS_Types": { + "Web/CSS/CSS_Values_and_Units/CSS_data_types": { "modified": "2019-03-18T21:45:05.678Z", "contributors": [ "TViglesGoom" @@ -11415,6 +11402,13 @@ "hinduCoder" ] }, + "Web/CSS/CSS_cascade/Inheritance": { + "modified": "2019-03-23T22:44:45.904Z", + "contributors": [ + "ViktorPalansky", + "BychekRU" + ] + }, "Web/CSS/CSS_cascade/Specificity": { "modified": "2019-03-23T22:31:13.059Z", "contributors": [ @@ -11427,6 +11421,39 @@ "102" ] }, + "Web/CSS/CSS_cascade/actual_value": { + "modified": "2019-03-23T22:31:07.849Z", + "contributors": [ + "warsan", + "BychekRU" + ] + }, + "Web/CSS/CSS_cascade/computed_value": { + "modified": "2019-03-23T22:31:07.128Z", + "contributors": [ + "ViktorPalansky", + "BychekRU" + ] + }, + "Web/CSS/CSS_cascade/initial_value": { + "modified": "2019-03-23T22:46:29.428Z", + "contributors": [ + "BychekRU" + ] + }, + "Web/CSS/CSS_cascade/specified_value": { + "modified": "2019-03-23T22:30:59.718Z", + "contributors": [ + "BychekRU" + ] + }, + "Web/CSS/CSS_cascade/used_value": { + "modified": "2019-11-29T01:24:06.046Z", + "contributors": [ + "wKich", + "Tuman" + ] + }, "Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties": { "modified": "2019-05-25T05:15:45.165Z", "contributors": [ @@ -11767,6 +11794,28 @@ "Hoopers_Hooch" ] }, + "Web/CSS/CSS_syntax/At-rule": { + "modified": "2019-11-07T14:56:39.596Z", + "contributors": [ + "sashakrauzer", + "JokerHD" + ] + }, + "Web/CSS/CSS_syntax/Comments": { + "modified": "2019-03-23T22:32:40.563Z", + "contributors": [ + "BychekRU", + "Evgeny166" + ] + }, + "Web/CSS/CSS_syntax/Syntax": { + "modified": "2019-07-26T04:52:30.660Z", + "contributors": [ + "munaticu", + "teoli", + "Norville" + ] + }, "Web/CSS/CSS_table": { "modified": "2019-03-23T22:31:01.222Z", "contributors": [ @@ -11811,13 +11860,6 @@ "opereverzeva" ] }, - "Web/CSS/Comments": { - "modified": "2019-03-23T22:32:40.563Z", - "contributors": [ - "BychekRU", - "Evgeny166" - ] - }, "Web/CSS/Descendant_combinator": { "modified": "2019-03-23T22:45:17.695Z", "contributors": [ @@ -11834,13 +11876,6 @@ "bilazikboy" ] }, - "Web/CSS/Inheritance": { - "modified": "2019-03-23T22:44:45.904Z", - "contributors": [ - "ViktorPalansky", - "BychekRU" - ] - }, "Web/CSS/Layout_cookbook": { "modified": "2020-09-30T16:32:50.977Z", "contributors": [ @@ -11951,14 +11986,6 @@ "BychekRU" ] }, - "Web/CSS/Syntax": { - "modified": "2019-07-26T04:52:30.660Z", - "contributors": [ - "munaticu", - "teoli", - "Norville" - ] - }, "Web/CSS/Type_selectors": { "modified": "2019-03-23T22:46:27.753Z", "contributors": [ @@ -11986,13 +12013,6 @@ "ViT09" ] }, - "Web/CSS/actual_value": { - "modified": "2019-03-23T22:31:07.849Z", - "contributors": [ - "warsan", - "BychekRU" - ] - }, "Web/CSS/align-content": { "modified": "2020-10-15T21:43:27.677Z", "contributors": [ @@ -12464,13 +12484,6 @@ "opereverzeva" ] }, - "Web/CSS/computed_value": { - "modified": "2019-03-23T22:31:07.128Z", - "contributors": [ - "ViktorPalansky", - "BychekRU" - ] - }, "Web/CSS/content": { "modified": "2020-10-15T22:17:47.064Z", "contributors": [ @@ -12799,12 +12812,6 @@ "bsergey" ] }, - "Web/CSS/initial_value": { - "modified": "2019-03-23T22:46:29.428Z", - "contributors": [ - "BychekRU" - ] - }, "Web/CSS/inline-size": { "modified": "2020-10-15T22:32:24.743Z", "contributors": [ @@ -13179,12 +13186,6 @@ "HImichun" ] }, - "Web/CSS/specified_value": { - "modified": "2019-03-23T22:30:59.718Z", - "contributors": [ - "BychekRU" - ] - }, "Web/CSS/tab-size": { "modified": "2020-10-15T22:18:59.542Z", "contributors": [ @@ -13331,13 +13332,6 @@ "delfin211" ] }, - "Web/CSS/used_value": { - "modified": "2019-11-29T01:24:06.046Z", - "contributors": [ - "wKich", - "Tuman" - ] - }, "Web/CSS/user-select": { "modified": "2020-10-15T22:22:28.429Z", "contributors": [ @@ -22020,6 +22014,12 @@ "warsan" ] }, + "conflicting/Web/API/console": { + "modified": "2019-03-18T21:20:36.516Z", + "contributors": [ + "AndreiSoroka" + ] + }, "conflicting/Web/JavaScript/Guide/Numbers_and_strings": { "modified": "2020-03-12T19:42:07.543Z", "contributors": [ diff --git a/files/ru/web/api/window/console/index.md b/files/ru/conflicting/web/api/console/index.md similarity index 94% rename from files/ru/web/api/window/console/index.md rename to files/ru/conflicting/web/api/console/index.md index 00fade4d6c1cc6..091fc5297bc022 100644 --- a/files/ru/web/api/window/console/index.md +++ b/files/ru/conflicting/web/api/console/index.md @@ -1,6 +1,7 @@ --- title: Window.console -slug: Web/API/Window/console +slug: conflicting/Web/API/console +original_slug: Web/API/Window/console --- {{ APIRef }} diff --git a/files/ru/web/css/actual_value/index.md b/files/ru/web/css/css_cascade/actual_value/index.md similarity index 97% rename from files/ru/web/css/actual_value/index.md rename to files/ru/web/css/css_cascade/actual_value/index.md index 7738530ed968b9..b2f0de1ead31fa 100644 --- a/files/ru/web/css/actual_value/index.md +++ b/files/ru/web/css/css_cascade/actual_value/index.md @@ -1,6 +1,6 @@ --- title: Действительное значение -slug: Web/CSS/actual_value +slug: Web/CSS/CSS_cascade/actual_value --- {{CSSRef}} diff --git a/files/ru/web/css/computed_value/index.md b/files/ru/web/css/css_cascade/computed_value/index.md similarity index 99% rename from files/ru/web/css/computed_value/index.md rename to files/ru/web/css/css_cascade/computed_value/index.md index 0af98815a4ddd5..b010dbf7afead1 100644 --- a/files/ru/web/css/computed_value/index.md +++ b/files/ru/web/css/css_cascade/computed_value/index.md @@ -1,6 +1,6 @@ --- title: Вычисленное значение -slug: Web/CSS/computed_value +slug: Web/CSS/CSS_cascade/computed_value --- {{cssref}} diff --git a/files/ru/web/css/inheritance/index.md b/files/ru/web/css/css_cascade/inheritance/index.md similarity index 99% rename from files/ru/web/css/inheritance/index.md rename to files/ru/web/css/css_cascade/inheritance/index.md index 0b8b823c6947f3..b1f2977764d31d 100644 --- a/files/ru/web/css/inheritance/index.md +++ b/files/ru/web/css/css_cascade/inheritance/index.md @@ -1,6 +1,6 @@ --- title: Наследование -slug: Web/CSS/Inheritance +slug: Web/CSS/CSS_cascade/Inheritance --- {{CSSRef}} diff --git a/files/ru/web/css/initial_value/index.md b/files/ru/web/css/css_cascade/initial_value/index.md similarity index 98% rename from files/ru/web/css/initial_value/index.md rename to files/ru/web/css/css_cascade/initial_value/index.md index fc4a4a98bbf452..97e8fab2e7d697 100644 --- a/files/ru/web/css/initial_value/index.md +++ b/files/ru/web/css/css_cascade/initial_value/index.md @@ -1,6 +1,6 @@ --- title: Начальное значение -slug: Web/CSS/initial_value +slug: Web/CSS/CSS_cascade/initial_value --- {{CSSRef}} diff --git a/files/ru/web/css/specified_value/index.md b/files/ru/web/css/css_cascade/specified_value/index.md similarity index 98% rename from files/ru/web/css/specified_value/index.md rename to files/ru/web/css/css_cascade/specified_value/index.md index 7f1602b9d1db50..e817242a7ceffe 100644 --- a/files/ru/web/css/specified_value/index.md +++ b/files/ru/web/css/css_cascade/specified_value/index.md @@ -1,6 +1,6 @@ --- title: Указанное значение -slug: Web/CSS/specified_value +slug: Web/CSS/CSS_cascade/specified_value --- {{CSSRef}} diff --git a/files/ru/web/css/used_value/index.md b/files/ru/web/css/css_cascade/used_value/index.md similarity index 99% rename from files/ru/web/css/used_value/index.md rename to files/ru/web/css/css_cascade/used_value/index.md index 47164b331fbb96..1a6bafc7fe4f50 100644 --- a/files/ru/web/css/used_value/index.md +++ b/files/ru/web/css/css_cascade/used_value/index.md @@ -1,6 +1,6 @@ --- title: Используемое значение -slug: Web/CSS/used_value +slug: Web/CSS/CSS_cascade/used_value --- {{cssref}}**Используемое значение** - [CSS](/ru/docs/Web/CSS) свойство, которое используется, когда все вычисления уже выполнены, смотрите [вычисленное значение](/ru/docs/Web/CSS/computed_value). diff --git a/files/ru/web/css/at-rule/index.md b/files/ru/web/css/css_syntax/at-rule/index.md similarity index 99% rename from files/ru/web/css/at-rule/index.md rename to files/ru/web/css/css_syntax/at-rule/index.md index 93950cb0d205ab..cc7186375fd578 100644 --- a/files/ru/web/css/at-rule/index.md +++ b/files/ru/web/css/css_syntax/at-rule/index.md @@ -1,6 +1,6 @@ --- title: At-rules -slug: Web/CSS/At-rule +slug: Web/CSS/CSS_syntax/At-rule --- {{cssref}} diff --git a/files/ru/web/css/comments/index.md b/files/ru/web/css/css_syntax/comments/index.md similarity index 98% rename from files/ru/web/css/comments/index.md rename to files/ru/web/css/css_syntax/comments/index.md index 9624d3b45292fa..c2d632f38cbfcc 100644 --- a/files/ru/web/css/comments/index.md +++ b/files/ru/web/css/css_syntax/comments/index.md @@ -1,6 +1,6 @@ --- title: Комментарии -slug: Web/CSS/Comments +slug: Web/CSS/CSS_syntax/Comments --- {{CSSRef}} diff --git a/files/ru/web/css/syntax/index.md b/files/ru/web/css/css_syntax/syntax/index.md similarity index 99% rename from files/ru/web/css/syntax/index.md rename to files/ru/web/css/css_syntax/syntax/index.md index a07a6c7a50f1b4..7c6d2944ae2e0c 100644 --- a/files/ru/web/css/syntax/index.md +++ b/files/ru/web/css/css_syntax/syntax/index.md @@ -1,6 +1,6 @@ --- title: Синтаксис -slug: Web/CSS/Syntax +slug: Web/CSS/CSS_syntax/Syntax --- {{cssref}}Основная задача Каскадных Стилей — это рассказать движку браузера, как отрисовать элементы страницы — каким цветом, как позиционировать их на странице, как украшать, и так далее. Синтаксис CSS построен следуя этой идее, и состоит из следующих основных блоков: diff --git a/files/ru/web/css/css_types/index.md b/files/ru/web/css/css_values_and_units/css_data_types/index.md similarity index 96% rename from files/ru/web/css/css_types/index.md rename to files/ru/web/css/css_values_and_units/css_data_types/index.md index bbbefb70f650ef..5d282212c11001 100644 --- a/files/ru/web/css/css_types/index.md +++ b/files/ru/web/css/css_values_and_units/css_data_types/index.md @@ -1,6 +1,6 @@ --- title: CSS basic data types -slug: Web/CSS/CSS_Types +slug: Web/CSS/CSS_Values_and_Units/CSS_data_types --- {{CssRef}}