aboutsummaryrefslogtreecommitdiff
path: root/files/es/conflicting/learn/css
diff options
context:
space:
mode:
Diffstat (limited to 'files/es/conflicting/learn/css')
-rw-r--r--files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html3
-rw-r--r--files/es/conflicting/learn/css/building_blocks/index.html3
-rw-r--r--files/es/conflicting/learn/css/building_blocks/selectors/index.html3
-rw-r--r--files/es/conflicting/learn/css/building_blocks/values_and_units/index.html3
-rw-r--r--files/es/conflicting/learn/css/css_layout/index.html3
-rw-r--r--files/es/conflicting/learn/css/first_steps/how_css_works/index.html3
-rw-r--r--files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html6
-rw-r--r--files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html4
-rw-r--r--files/es/conflicting/learn/css/first_steps/index.html5
-rw-r--r--files/es/conflicting/learn/css/styling_text/fundamentals/index.html3
10 files changed, 24 insertions, 12 deletions
diff --git a/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
index b47218eb7a..d927df50e1 100644
--- a/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
@@ -1,8 +1,9 @@
---
title: Cascada y herencia
-slug: Web/CSS/Introducción/Cascading_and_inheritance
+slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance
translation_of: Learn/CSS/Building_blocks/Cascade_and_inheritance
translation_of_original: Web/Guide/CSS/Getting_started/Cascading_and_inheritance
+original_slug: Web/CSS/Introducción/Cascading_and_inheritance
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/building_blocks/index.html b/files/es/conflicting/learn/css/building_blocks/index.html
index caccdd80b2..6c07d85ec3 100644
--- a/files/es/conflicting/learn/css/building_blocks/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/index.html
@@ -1,8 +1,9 @@
---
title: Boxes
-slug: Web/CSS/Introducción/Boxes
+slug: conflicting/Learn/CSS/Building_blocks
translation_of: Learn/CSS/Building_blocks
translation_of_original: Web/Guide/CSS/Getting_started/Boxes
+original_slug: Web/CSS/Introducción/Boxes
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/building_blocks/selectors/index.html b/files/es/conflicting/learn/css/building_blocks/selectors/index.html
index 9ebe3573e8..c15b94b415 100644
--- a/files/es/conflicting/learn/css/building_blocks/selectors/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/selectors/index.html
@@ -1,8 +1,9 @@
---
title: Selectores
-slug: Web/CSS/Introducción/Selectors
+slug: conflicting/Learn/CSS/Building_blocks/Selectors
translation_of: Learn/CSS/Building_blocks/Selectors
translation_of_original: Web/Guide/CSS/Getting_started/Selectors
+original_slug: Web/CSS/Introducción/Selectors
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html
index 030fa9d692..79b7ac23cb 100644
--- a/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html
+++ b/files/es/conflicting/learn/css/building_blocks/values_and_units/index.html
@@ -1,8 +1,9 @@
---
title: Color
-slug: Web/CSS/Introducción/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/CSS/Introducción/Color
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/css_layout/index.html b/files/es/conflicting/learn/css/css_layout/index.html
index f71d3a82e6..86364b84fa 100644
--- a/files/es/conflicting/learn/css/css_layout/index.html
+++ b/files/es/conflicting/learn/css/css_layout/index.html
@@ -1,8 +1,9 @@
---
title: Layout
-slug: Web/CSS/Introducción/Layout
+slug: conflicting/Learn/CSS/CSS_layout
translation_of: Learn/CSS/CSS_layout
translation_of_original: Web/Guide/CSS/Getting_started/Layout
+original_slug: Web/CSS/Introducción/Layout
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/first_steps/how_css_works/index.html b/files/es/conflicting/learn/css/first_steps/how_css_works/index.html
index 941f96a0e5..831a835c72 100644
--- a/files/es/conflicting/learn/css/first_steps/how_css_works/index.html
+++ b/files/es/conflicting/learn/css/first_steps/how_css_works/index.html
@@ -1,8 +1,9 @@
---
title: Por que usar CSS
-slug: Web/CSS/Como_iniciar/Por_que_usar_CSS
+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/Why_use_CSS
+original_slug: Web/CSS/Como_iniciar/Por_que_usar_CSS
---
<p> </p>
<p>Esta página explica por qué los documentos usan CSS. Usas CSS para añadir una hoja de estilos a tu documento de prueba.</p>
diff --git a/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html b/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html
index f4beb05519..6db03d40c8 100644
--- a/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html
+++ b/files/es/conflicting/learn/css/first_steps/how_css_works_194e34e451d4ace023d98021c00b3cfd/index.html
@@ -1,16 +1,18 @@
---
title: Cómo funciona el CSS
-slug: Web/CSS/Introducción/How_CSS_works
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_194e34e451d4ace023d98021c00b3cfd
tags:
- CSS
- 'CSS:'
- - 'CSS:Empezando'
+ - CSS:Empezando
- Diseño
- Guía
- Inicio
- Web
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works
+original_slug: Web/CSS/Introducción/How_CSS_works
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html b/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html
index 18852f2439..a46c22f85e 100644
--- a/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html
+++ b/files/es/conflicting/learn/css/first_steps/how_css_works_a460b5a76c3c2e7fc9b8da464dfd0c22/index.html
@@ -1,10 +1,12 @@
---
title: Que es CSS
-slug: Web/CSS/Como_iniciar/Que_es_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_a460b5a76c3c2e7fc9b8da464dfd0c22
tags:
- para_revisar
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/What_is_CSS
+original_slug: Web/CSS/Como_iniciar/Que_es_CSS
---
<p>En esta página se explica que es CSS. Usted creará un documento simple con el cual trabajará en las próximas páginas del tutorial.</p>
diff --git a/files/es/conflicting/learn/css/first_steps/index.html b/files/es/conflicting/learn/css/first_steps/index.html
index 09177572fa..ffcef61e68 100644
--- a/files/es/conflicting/learn/css/first_steps/index.html
+++ b/files/es/conflicting/learn/css/first_steps/index.html
@@ -1,12 +1,13 @@
---
title: Introducción
-slug: Web/CSS/Introducción
+slug: conflicting/Learn/CSS/First_steps
tags:
- CSS
- - 'CSS:Introducción'
+ - CSS:Introducción
- para_revisar
translation_of: Learn/CSS/First_steps
translation_of_original: Web/Guide/CSS/Getting_started
+original_slug: Web/CSS/Introducción
---
<h2 id="Presentación"><span class="goog-gtc-unit" id="goog-gtc-unit-2"><span class="goog-gtc-from-human goog-gtc-translatable" dir="ltr">Presentación</span></span></h2>
diff --git a/files/es/conflicting/learn/css/styling_text/fundamentals/index.html b/files/es/conflicting/learn/css/styling_text/fundamentals/index.html
index 1788c8c0ee..19c967bb6c 100644
--- a/files/es/conflicting/learn/css/styling_text/fundamentals/index.html
+++ b/files/es/conflicting/learn/css/styling_text/fundamentals/index.html
@@ -1,8 +1,9 @@
---
title: Los estilos de texto
-slug: 'Web/CSS/Introducción/Los:estilos_de_texto'
+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/CSS/Introducción/Los:estilos_de_texto
---
<p>{{ CSSTutorialTOC() }}</p>