diff options
Diffstat (limited to 'files/ru/conflicting/learn')
13 files changed, 33 insertions, 17 deletions
diff --git a/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html index a192eb1d28..346f30c01e 100644 --- a/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html @@ -1,16 +1,17 @@ --- title: Каскадность и наследование -slug: Web/Guide/CSS/Getting_started/Cascading_and_inheritance +slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Guide - Web - Веб - Новичку translation_of: Learn/CSS/Building_blocks/Cascade_and_inheritance translation_of_original: Web/Guide/CSS/Getting_started/Cascading_and_inheritance +original_slug: Web/Guide/CSS/Getting_started/Cascading_and_inheritance --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/selectors/index.html b/files/ru/conflicting/learn/css/building_blocks/selectors/index.html index a6d9e5d116..f883db7b62 100644 --- a/files/ru/conflicting/learn/css/building_blocks/selectors/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/selectors/index.html @@ -1,8 +1,9 @@ --- title: 'CSS properties: what they are and how to use them' -slug: Learn/CSS/CSS_properties +slug: conflicting/Learn/CSS/Building_blocks/Selectors translation_of: Learn/CSS/Building_blocks/Selectors translation_of_original: Learn/CSS/CSS_properties +original_slug: Learn/CSS/CSS_properties --- <div class="summary"> <p>{{Glossary("CSS")}} определяет как должна выглядеть вебстраница. Он использует предопределенные правила вместе с селекторами и свойствами для применения стилей к элементам HTML или группам элементов.</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html b/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html index 797aefefa3..f66eb23b48 100644 --- a/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/selectors_918fb6c37a4d06789bc062c48d591992/index.html @@ -1,8 +1,10 @@ --- title: Selectors -slug: Web/Guide/CSS/Getting_started/Selectors +slug: >- + conflicting/Learn/CSS/Building_blocks/Selectors_918fb6c37a4d06789bc062c48d591992 translation_of: Learn/CSS/Building_blocks/Selectors translation_of_original: Web/Guide/CSS/Getting_started/Selectors +original_slug: Web/Guide/CSS/Getting_started/Selectors --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html b/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html index 82b7edae60..738d092cbe 100644 --- a/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/styling_tables/index.html @@ -1,12 +1,13 @@ --- title: Таблицы -slug: Web/Guide/CSS/Getting_started/Таблицы +slug: conflicting/Learn/CSS/Building_blocks/Styling_tables tags: - CSS - Веб - Руководство translation_of: Learn/CSS/Building_blocks/Styling_tables translation_of_original: Web/Guide/CSS/Getting_started/Tables +original_slug: Web/Guide/CSS/Getting_started/Таблицы --- <p>{{CSSTutorialTOC}}{{previousPage("/ru/docs/Web/Guide/CSS/Getting_Started/Layout", "Layout")}}</p> diff --git a/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html index 911a8010b6..504ee90832 100644 --- a/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html +++ b/files/ru/conflicting/learn/css/building_blocks/values_and_units/index.html @@ -1,8 +1,9 @@ --- title: Color -slug: Web/Guide/CSS/Getting_started/Color +slug: conflicting/Learn/CSS/Building_blocks/Values_and_units translation_of: Learn/CSS/Introduction_to_CSS/Values_and_units#Colors translation_of_original: Web/Guide/CSS/Getting_started/Color +original_slug: Web/Guide/CSS/Getting_started/Color --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html index 9e9a4231a9..5f825e836d 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_is_structured/index.html @@ -1,8 +1,9 @@ --- title: Чистый СSS код -slug: Web/Guide/CSS/Getting_started/Readable_CSS +slug: conflicting/Learn/CSS/First_steps/How_CSS_is_structured translation_of: Learn/CSS/Introduction_to_CSS/Syntax#Beyond_syntax_make_CSS_readable translation_of_original: Web/Guide/CSS/Getting_started/Readable_CSS +original_slug: Web/Guide/CSS/Getting_started/Readable_CSS --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html index 9edeb9fe1f..8e7fae4eb2 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_works/index.html @@ -1,8 +1,9 @@ --- title: Как работает CSS -slug: Web/Guide/CSS/Getting_started/How_CSS_works +slug: conflicting/Learn/CSS/First_steps/How_CSS_works translation_of: Learn/CSS/First_steps/How_CSS_works translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works +original_slug: Web/Guide/CSS/Getting_started/How_CSS_works --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html index 3041d28920..05b7c9e54c 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_works_64ba4331a7a5f4319c6e06b06ccdd521/index.html @@ -1,10 +1,11 @@ --- title: Зачем нужен CSS? -slug: Web/Guide/CSS/Getting_started/Why_use_CSS +slug: >- + conflicting/Learn/CSS/First_steps/How_CSS_works_64ba4331a7a5f4319c6e06b06ccdd521 tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Example - Guide - Web @@ -13,6 +14,7 @@ tags: - Руководство translation_of: Learn/CSS/First_steps/How_CSS_works translation_of_original: Web/Guide/CSS/Getting_started/Why_use_CSS +original_slug: Web/Guide/CSS/Getting_started/Why_use_CSS --- <p><span style="line-height: 1.5;">{{ CSSTutorialTOC() }}</span></p> diff --git a/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html b/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html index 95df2fe915..b97a4ef068 100644 --- a/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html +++ b/files/ru/conflicting/learn/css/first_steps/how_css_works_b66915031fb62b5fee1201086144e209/index.html @@ -1,16 +1,18 @@ --- title: Что такое CSS? -slug: Web/Guide/CSS/Getting_started/What_is_CSS +slug: >- + conflicting/Learn/CSS/First_steps/How_CSS_works_b66915031fb62b5fee1201086144e209 tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Example - Guide - Веб - Новичку translation_of: Learn/CSS/First_steps/How_CSS_works translation_of_original: Web/Guide/CSS/Getting_started/What_is_CSS +original_slug: Web/Guide/CSS/Getting_started/What_is_CSS --- <div>{{ CSSTutorialTOC() }}</div> diff --git a/files/ru/conflicting/learn/css/first_steps/index.html b/files/ru/conflicting/learn/css/first_steps/index.html index b2f6ebed77..e7f3f73dce 100644 --- a/files/ru/conflicting/learn/css/first_steps/index.html +++ b/files/ru/conflicting/learn/css/first_steps/index.html @@ -1,10 +1,10 @@ --- title: CSS для начинающих -slug: Web/Guide/CSS/Getting_started +slug: conflicting/Learn/CSS/First_steps tags: - Beginner - CSS - - 'CSS:Getting_Started' + - CSS:Getting_Started - Guide - Needs - NeedsBeginnerUpdate @@ -16,6 +16,7 @@ tags: - Руководство translation_of: Learn/CSS/First_steps translation_of_original: Web/Guide/CSS/Getting_started +original_slug: Web/Guide/CSS/Getting_started --- <p><span class="seoSummary">Это руководство (самоучитель) познакомит вас с базовыми возможностями и языком (синтаксом) <a href="/ru/docs/Web/Guide/CSS" title="/ru/docs/Web/Guide/CSS"><strong>Каскадных таблиц стилей</strong></a> (CSS). CSS используется для изменения внешнего вида структурированного документа, такого как веб-страница. Руководство также включает простые упражнения, которые вы сможете выполнить на своем компьютере и увидеть, как работает CSS, а также его возможности в современных браузерах. </span></p> diff --git a/files/ru/conflicting/learn/css/index.html b/files/ru/conflicting/learn/css/index.html index 7529234ef5..2a639c4b61 100644 --- a/files/ru/conflicting/learn/css/index.html +++ b/files/ru/conflicting/learn/css/index.html @@ -1,6 +1,6 @@ --- title: Руководство разработчика CSS -slug: Web/Guide/CSS +slug: conflicting/Learn/CSS tags: - CSS - Landing @@ -8,5 +8,6 @@ tags: - TopicStub translation_of: Learn/CSS translation_of_original: Web/Guide/CSS +original_slug: Web/Guide/CSS --- prepare for redirect diff --git a/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html b/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html index a25565cf79..f61ad3b65e 100644 --- a/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html +++ b/files/ru/conflicting/learn/css/styling_text/fundamentals/index.html @@ -1,8 +1,9 @@ --- title: Text styles -slug: Web/Guide/CSS/Getting_started/Text_styles +slug: conflicting/Learn/CSS/Styling_text/Fundamentals translation_of: Learn/CSS/Styling_text/Fundamentals translation_of_original: Web/Guide/CSS/Getting_started/Text_styles +original_slug: Web/Guide/CSS/Getting_started/Text_styles --- <p>{{ CSSTutorialTOC() }}</p> diff --git a/files/ru/conflicting/learn/javascript/objects/index.html b/files/ru/conflicting/learn/javascript/objects/index.html index d07cf043cc..1fe76e2806 100644 --- a/files/ru/conflicting/learn/javascript/objects/index.html +++ b/files/ru/conflicting/learn/javascript/objects/index.html @@ -1,8 +1,9 @@ --- title: Вступление в Объектно-ориентированный JavaScript -slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript +slug: conflicting/Learn/JavaScript/Objects translation_of: Learn/JavaScript/Objects translation_of_original: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript +original_slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript --- <p>Объектно-ориентированный до основания, JavaScript предоставляет мощные и гибкие {{Glossary("OOP")}} возможности. Эта статья начинается с введения в объектно-ориентированное программирование, затем рассматривает модель объекта JavaScript и, наконец, демонстрирует концепции объектно-ориентированного программирования в JavaScript.</p> |