aboutsummaryrefslogtreecommitdiff
path: root/files/ca/conflicting/learn/css
diff options
context:
space:
mode:
Diffstat (limited to 'files/ca/conflicting/learn/css')
-rw-r--r--files/ca/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html5
-rw-r--r--files/ca/conflicting/learn/css/building_blocks/index.html5
-rw-r--r--files/ca/conflicting/learn/css/building_blocks/selectors/index.html5
-rw-r--r--files/ca/conflicting/learn/css/building_blocks/styling_tables/index.html5
-rw-r--r--files/ca/conflicting/learn/css/building_blocks/values_and_units/index.html5
-rw-r--r--files/ca/conflicting/learn/css/css_layout/index.html5
-rw-r--r--files/ca/conflicting/learn/css/first_steps/how_css_is_structured/index.html5
-rw-r--r--files/ca/conflicting/learn/css/first_steps/how_css_works/index.html5
-rw-r--r--files/ca/conflicting/learn/css/first_steps/how_css_works_54b8e7ce45c74338181144ded4fbdccf/index.html6
-rw-r--r--files/ca/conflicting/learn/css/first_steps/how_css_works_9566880e82eb23b2f47f8821f75e0ab1/index.html6
-rw-r--r--files/ca/conflicting/learn/css/first_steps/index.html5
-rw-r--r--files/ca/conflicting/learn/css/styling_text/fundamentals/index.html5
-rw-r--r--files/ca/conflicting/learn/css/styling_text/styling_lists/index.html5
13 files changed, 41 insertions, 26 deletions
diff --git a/files/ca/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/ca/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
index b7bf86a77f..738c16d558 100644
--- a/files/ca/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
+++ b/files/ca/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
@@ -1,16 +1,17 @@
---
title: Cascada i herència
-slug: Web/Guide/CSS/Inici_en_CSS/Cascada_i_herència
+slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance
tags:
- Beginner
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Guide
- NeedsBeginnerUpdate
- NeedsUpdate
- 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/Inici_en_CSS/Cascada_i_herència
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/building_blocks/index.html b/files/ca/conflicting/learn/css/building_blocks/index.html
index 39d411bb19..b0105c59c4 100644
--- a/files/ca/conflicting/learn/css/building_blocks/index.html
+++ b/files/ca/conflicting/learn/css/building_blocks/index.html
@@ -1,6 +1,6 @@
---
title: Caixes
-slug: Web/Guide/CSS/Inici_en_CSS/Caixes
+slug: conflicting/Learn/CSS/Building_blocks
tags:
- Basic
- Beginner
@@ -8,12 +8,13 @@ tags:
- CSS Borders
- CSS Margin
- CSS Padding
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- NeedsBeginnerUpdate
- NeedsUpdate
- Web
translation_of: Learn/CSS/Building_blocks
translation_of_original: Web/Guide/CSS/Getting_started/Boxes
+original_slug: Web/Guide/CSS/Inici_en_CSS/Caixes
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/building_blocks/selectors/index.html b/files/ca/conflicting/learn/css/building_blocks/selectors/index.html
index a3e8534ee5..3e3f5edc98 100644
--- a/files/ca/conflicting/learn/css/building_blocks/selectors/index.html
+++ b/files/ca/conflicting/learn/css/building_blocks/selectors/index.html
@@ -1,11 +1,11 @@
---
title: Selectors
-slug: Web/Guide/CSS/Inici_en_CSS/Selectors
+slug: conflicting/Learn/CSS/Building_blocks/Selectors
tags:
- Beginner
- CSS
- CSS Selector
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Example
- Guide
- NeedsBeginnerUpdate
@@ -14,6 +14,7 @@ tags:
- Web
translation_of: Learn/CSS/Building_blocks/Selectors
translation_of_original: Web/Guide/CSS/Getting_started/Selectors
+original_slug: Web/Guide/CSS/Inici_en_CSS/Selectors
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/building_blocks/styling_tables/index.html b/files/ca/conflicting/learn/css/building_blocks/styling_tables/index.html
index d7875ae370..7b09140c78 100644
--- a/files/ca/conflicting/learn/css/building_blocks/styling_tables/index.html
+++ b/files/ca/conflicting/learn/css/building_blocks/styling_tables/index.html
@@ -1,10 +1,10 @@
---
title: Taules
-slug: Web/Guide/CSS/Inici_en_CSS/Taules
+slug: conflicting/Learn/CSS/Building_blocks/Styling_tables
tags:
- CSS
- CSS Tables
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Example
- Guide
- Intermediate
@@ -14,6 +14,7 @@ tags:
- Web
translation_of: Learn/CSS/Building_blocks/Styling_tables
translation_of_original: Web/Guide/CSS/Getting_started/Tables
+original_slug: Web/Guide/CSS/Inici_en_CSS/Taules
---
<p>{{CSSTutorialTOC}}{{previousPage("/en-US/docs/Web/Guide/CSS/Getting_Started/Layout", "Disseny")}}</p>
diff --git a/files/ca/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/ca/conflicting/learn/css/building_blocks/values_and_units/index.html
index ba607aab18..dc9e9a197e 100644
--- a/files/ca/conflicting/learn/css/building_blocks/values_and_units/index.html
+++ b/files/ca/conflicting/learn/css/building_blocks/values_and_units/index.html
@@ -1,10 +1,10 @@
---
title: Color
-slug: Web/Guide/CSS/Inici_en_CSS/Color
+slug: conflicting/Learn/CSS/Building_blocks/Values_and_units
tags:
- Beginner
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Example
- Guide
- NeedsBeginnerUpdate
@@ -12,6 +12,7 @@ tags:
- Web
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/Inici_en_CSS/Color
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/css_layout/index.html b/files/ca/conflicting/learn/css/css_layout/index.html
index 28045a681d..b19a07ffe4 100644
--- a/files/ca/conflicting/learn/css/css_layout/index.html
+++ b/files/ca/conflicting/learn/css/css_layout/index.html
@@ -1,12 +1,12 @@
---
title: Disseny
-slug: Web/Guide/CSS/Inici_en_CSS/Disseny
+slug: conflicting/Learn/CSS/CSS_layout
tags:
- CSS
- CSS Float
- CSS Text Align
- CSS Unit
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Example
- Guide
- Intermediate
@@ -16,6 +16,7 @@ tags:
- Web
translation_of: Learn/CSS/CSS_layout
translation_of_original: Web/Guide/CSS/Getting_started/Layout
+original_slug: Web/Guide/CSS/Inici_en_CSS/Disseny
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/first_steps/how_css_is_structured/index.html b/files/ca/conflicting/learn/css/first_steps/how_css_is_structured/index.html
index 15b376dad0..d2b6959c85 100644
--- a/files/ca/conflicting/learn/css/first_steps/how_css_is_structured/index.html
+++ b/files/ca/conflicting/learn/css/first_steps/how_css_is_structured/index.html
@@ -1,9 +1,9 @@
---
title: CSS llegible
-slug: Web/Guide/CSS/Inici_en_CSS/CSS_llegible
+slug: conflicting/Learn/CSS/First_steps/How_CSS_is_structured
tags:
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Guide
- Intermediate
- NeedsBeginnerUpdate
@@ -11,6 +11,7 @@ tags:
- Web
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/Inici_en_CSS/CSS_llegible
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/first_steps/how_css_works/index.html b/files/ca/conflicting/learn/css/first_steps/how_css_works/index.html
index eb6512b8bb..067de9bb09 100644
--- a/files/ca/conflicting/learn/css/first_steps/how_css_works/index.html
+++ b/files/ca/conflicting/learn/css/first_steps/how_css_works/index.html
@@ -1,16 +1,17 @@
---
title: Com funciona el CSS
-slug: Web/Guide/CSS/Inici_en_CSS/Com_funciona_el_CSS
+slug: conflicting/Learn/CSS/First_steps/How_CSS_works
tags:
- Beginner
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Guide
- NeedsBeginnerUpdate
- NeedsUpdate
- Web
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/Inici_en_CSS/Com_funciona_el_CSS
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/first_steps/how_css_works_54b8e7ce45c74338181144ded4fbdccf/index.html b/files/ca/conflicting/learn/css/first_steps/how_css_works_54b8e7ce45c74338181144ded4fbdccf/index.html
index d3685309c7..99da18a2b6 100644
--- a/files/ca/conflicting/learn/css/first_steps/how_css_works_54b8e7ce45c74338181144ded4fbdccf/index.html
+++ b/files/ca/conflicting/learn/css/first_steps/how_css_works_54b8e7ce45c74338181144ded4fbdccf/index.html
@@ -1,16 +1,18 @@
---
title: Per què utilitzar CSS?
-slug: Web/Guide/CSS/Inici_en_CSS/Per_què_utilitzar_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_54b8e7ce45c74338181144ded4fbdccf
tags:
- Beginner
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Example
- Guide
- NeedsBeginnerUpdate
- Web
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/Inici_en_CSS/Per_què_utilitzar_CSS
---
<p><span style="line-height: 1.5;">{{ CSSTutorialTOC() }}</span></p>
diff --git a/files/ca/conflicting/learn/css/first_steps/how_css_works_9566880e82eb23b2f47f8821f75e0ab1/index.html b/files/ca/conflicting/learn/css/first_steps/how_css_works_9566880e82eb23b2f47f8821f75e0ab1/index.html
index 28db41fa98..5d4592efb8 100644
--- a/files/ca/conflicting/learn/css/first_steps/how_css_works_9566880e82eb23b2f47f8821f75e0ab1/index.html
+++ b/files/ca/conflicting/learn/css/first_steps/how_css_works_9566880e82eb23b2f47f8821f75e0ab1/index.html
@@ -1,16 +1,18 @@
---
title: Que és CSS?
-slug: Web/Guide/CSS/Inici_en_CSS/Que_és_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_9566880e82eb23b2f47f8821f75e0ab1
tags:
- Beginner
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Example
- Guide
- NeedsBeginnerUpdate
- Web
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/Inici_en_CSS/Que_és_CSS
---
<div>{{CSSTutorialTOC}}</div>
diff --git a/files/ca/conflicting/learn/css/first_steps/index.html b/files/ca/conflicting/learn/css/first_steps/index.html
index 8de66f308e..2f821fe1eb 100644
--- a/files/ca/conflicting/learn/css/first_steps/index.html
+++ b/files/ca/conflicting/learn/css/first_steps/index.html
@@ -1,10 +1,10 @@
---
title: Inici en CSS
-slug: Web/Guide/CSS/Inici_en_CSS
+slug: conflicting/Learn/CSS/First_steps
tags:
- Beginner
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Guide
- Needs
- NeedsBeginnerUpdate
@@ -12,6 +12,7 @@ tags:
- Web
translation_of: Learn/CSS/First_steps
translation_of_original: Web/Guide/CSS/Getting_started
+original_slug: Web/Guide/CSS/Inici_en_CSS
---
<p>Aquest tutorial és una introducció a les característiques bàsiques i llenguatge (la sintaxi) per als <strong><a href="https://developer.mozilla.org/en-US/docs/Web/Guide/CSS">fulls d'estil en cascada</a></strong><span class="seoSummary"><a href="https://developer.mozilla.org/en-US/docs/Web/Guide/CSS"><strong>(Cascading Style Sheets)</strong></a> (CSS). </span>S'utilitza CSS per canviar l'aspecte d'un document estructurat, com ara una pàgina web. El tutorial també inclou exemples d'exercicis que podeu provar en el vostre ordinador per veure els efectes de les CSS i les característiques que funcionen en els navegadors moderns.</p>
diff --git a/files/ca/conflicting/learn/css/styling_text/fundamentals/index.html b/files/ca/conflicting/learn/css/styling_text/fundamentals/index.html
index a1a8c9364f..8561eb551c 100644
--- a/files/ca/conflicting/learn/css/styling_text/fundamentals/index.html
+++ b/files/ca/conflicting/learn/css/styling_text/fundamentals/index.html
@@ -1,11 +1,11 @@
---
title: Estils de text
-slug: Web/Guide/CSS/Inici_en_CSS/Estils_de_text
+slug: conflicting/Learn/CSS/Styling_text/Fundamentals
tags:
- Beginner
- CSS
- CSS Fonts
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Guide
- NeedsBeginnerUpdate
- NeedsLiveSample
@@ -13,6 +13,7 @@ tags:
- Web
translation_of: Learn/CSS/Styling_text/Fundamentals
translation_of_original: Web/Guide/CSS/Getting_started/Text_styles
+original_slug: Web/Guide/CSS/Inici_en_CSS/Estils_de_text
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/ca/conflicting/learn/css/styling_text/styling_lists/index.html b/files/ca/conflicting/learn/css/styling_text/styling_lists/index.html
index a6bd0d31a1..7968e26f8b 100644
--- a/files/ca/conflicting/learn/css/styling_text/styling_lists/index.html
+++ b/files/ca/conflicting/learn/css/styling_text/styling_lists/index.html
@@ -1,10 +1,10 @@
---
title: Llistes
-slug: Web/Guide/CSS/Inici_en_CSS/Llistes
+slug: conflicting/Learn/CSS/Styling_text/Styling_lists
tags:
- Beginner
- CSS
- - 'CSS:Getting_Started'
+ - CSS:Getting_Started
- Example
- Guide
- Intermediate
@@ -13,6 +13,7 @@ tags:
- Web
translation_of: Learn/CSS/Styling_text/Styling_lists
translation_of_original: Web/Guide/CSS/Getting_started/Lists
+original_slug: Web/Guide/CSS/Inici_en_CSS/Llistes
---
<p>{{ CSSTutorialTOC() }}</p>