<script language="JavaScript">
<!--
function _AN_global_var_init(){
	_AN_this_url = "/prx/000/";
	_AN_base_scheme = "https";
	_AN_base_host = "https://patch-diff.githubusercontent.com";
	_AN_base_path = "https://patch-diff.githubusercontent.com/raw/4GeeksAcademy/css-tutorial-exercises-course/pull/";
	_AN_encode_urls = 0;
	_AN_mpo = 1;
	_AN_md = 0;
	_AN_rel_urls = 1;
	_AN_nav_switch = 0;
	_AN_nav_allowurl = 1;
	_AN_nav_override = 0;
	_AN_has_iframe = 0;
	_AN_dbg_flags = null;
	_AN_nav_use_aaa = 1;
	_AN_expires_pass = 0;
	_AN_wrap_evthandlers = 0;
	_AN_rewrite_param_exact = 0;
	_AN_obj_params = {};
} 
_AN_global_var_init();
//-->
</script>
<script language="JavaScript" src="/prx/001/http/localh/an_util.js"></script>
<script language="JavaScript" src="/prx/001/http/localh/NSLib.js"></script>

From b3d5c7be573a2d1cdebeb9465e01b7eced6fd800 Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:50:50 +0100
Subject: [PATCH 1/8] Update README.md

---
 exercises/04.1-Combined-Rules/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/exercises/04.1-Combined-Rules/README.md b/exercises/04.1-Combined-Rules/README.md
index bd17ad14..45e0d3a7 100644
--- a/exercises/04.1-Combined-Rules/README.md
+++ b/exercises/04.1-Combined-Rules/README.md
@@ -4,9 +4,9 @@ tutorial: "https://youtu.be/watch?v=uQS5QeEE-B4"
 
 # `04.1` Combined Rules
 
-CSS files take space on your server and also take time to download (like everything); it is yet another text document that the browser has to download before rendering the page, which is why is important to keep the CSS document as small as possible.
+CSS files take up space on your server and also take time to download (like everything); it is yet another text document that the browser has to download before rendering the page, which is why it is important to keep the CSS document as small as possible.
 
-One way to do that is by combining several properties into one such as with `border`:
+One way to do that is by combining several properties into one, such as with `border`:
 
 ```css
 border-color: black;
@@ -14,7 +14,7 @@ border-style: solid;
 border-width: 1px;
 ```
 
-Border's properties can be consolidated into a single line as:
+Border's properties can be consolidated into a single line like this:
 
 ```css
 border: black 1px solid;
@@ -24,11 +24,11 @@ border: black 1px solid;
 
 1. Combine the 4 padding rules into just one using the `padding` rule.
 
-2. Combine the all background rules, but the `background-size`, into just one line using the `background:` rule.
+2. Combine all background rules, but the `background-size`, into just one line using the `background:` rule.
 
 *The `background-size` cannot be combined, the browsers don't support it yet.*
 
-## Hint:
+## 💡 Hint:
 
 - How to use the background-size: http://lmgtfy.com/?q=css+background
 

From 4b5a4585148e21e942aa70d5cced93b02a672e70 Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:54:15 +0100
Subject: [PATCH 2/8] Update README.md

---
 exercises/04.1-Combined-Rules/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/04.1-Combined-Rules/README.md b/exercises/04.1-Combined-Rules/README.md
index 45e0d3a7..05792645 100644
--- a/exercises/04.1-Combined-Rules/README.md
+++ b/exercises/04.1-Combined-Rules/README.md
@@ -24,7 +24,7 @@ border: black 1px solid;
 
 1. Combine the 4 padding rules into just one using the `padding` rule.
 
-2. Combine all background rules, but the `background-size`, into just one line using the `background:` rule.
+2. Combine all background rules, but the `background-size`, into just one line using the `background` rule.
 
 *The `background-size` cannot be combined, the browsers don't support it yet.*
 

From fd034f6cfa85daa14701dead12dae48c7fa7bf2f Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:58:56 +0100
Subject: [PATCH 3/8] Update README.es.md

---
 exercises/04.1-Combined-Rules/README.es.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/exercises/04.1-Combined-Rules/README.es.md b/exercises/04.1-Combined-Rules/README.es.md
index 59f7be55..b180138e 100644
--- a/exercises/04.1-Combined-Rules/README.es.md
+++ b/exercises/04.1-Combined-Rules/README.es.md
@@ -2,7 +2,7 @@
 
 Los archivos CSS ocupan espacio en tu servidor y también tardan en descargarse (como todo); es otro documento de texto que el navegador debe descargar antes de mostrar la página, por lo que es importante mantener el documento CSS lo más pequeño posible.
 
-Una forma de hacerlo es combinando varias propiedades en una, como con "border":
+Una forma de hacerlo es combinando varias propiedades en una, como con `border`:
 
 ```css
 border-color: black;
@@ -25,7 +25,7 @@ border: black 1px solid;
 
 *El `background-size` no se puede combinar, los navegadores aún no lo admiten.*
 
-## Pista:
+## 💡 Pista:
 
-- Como usar el background-size: http://lmgtfy.com/?q=css+background
-- Como usar el padding: http://lmgtfy.com/?q=css+padding
+- Cómo usar el background-size: http://lmgtfy.com/?q=css+background
+- Cómo usar el padding: http://lmgtfy.com/?q=css+padding

From 0a4d7a352aa6a065c87a0860bf17822d3687b7ea Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:59:25 +0100
Subject: [PATCH 4/8] Update README.md

---
 exercises/04.1-Combined-Rules/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/04.1-Combined-Rules/README.md b/exercises/04.1-Combined-Rules/README.md
index 05792645..45e0d3a7 100644
--- a/exercises/04.1-Combined-Rules/README.md
+++ b/exercises/04.1-Combined-Rules/README.md
@@ -24,7 +24,7 @@ border: black 1px solid;
 
 1. Combine the 4 padding rules into just one using the `padding` rule.
 
-2. Combine all background rules, but the `background-size`, into just one line using the `background` rule.
+2. Combine all background rules, but the `background-size`, into just one line using the `background:` rule.
 
 *The `background-size` cannot be combined, the browsers don't support it yet.*
 

From e2de79f660c2d60a97bfdb2896092d893204ffd8 Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 21:00:31 +0100
Subject: [PATCH 5/8] Update README.es.md

---
 exercises/04.1-Combined-Rules/README.es.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/04.1-Combined-Rules/README.es.md b/exercises/04.1-Combined-Rules/README.es.md
index b180138e..5babd4d5 100644
--- a/exercises/04.1-Combined-Rules/README.es.md
+++ b/exercises/04.1-Combined-Rules/README.es.md
@@ -16,7 +16,7 @@ Las propiedades de border se pueden consolidar en una sola línea así:
 border: black 1px solid;
 ```
 
-# 📝 Instrucciones:
+## 📝 Instrucciones:
 
 
 1. Combina las 4 reglas de padding en una sola utilizando la regla `padding`.

From 38de7bc877f97a924bd9fcf4435720f3e1f70d9c Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 21:05:30 +0100
Subject: [PATCH 6/8] Update tests.js

---
 exercises/04.1-Combined-Rules/tests.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/exercises/04.1-Combined-Rules/tests.js b/exercises/04.1-Combined-Rules/tests.js
index c6f62acc..30c66793 100644
--- a/exercises/04.1-Combined-Rules/tests.js
+++ b/exercises/04.1-Combined-Rules/tests.js
@@ -11,7 +11,7 @@ describe("All the styles should be applied", ()=> {
   const link = document.querySelector("link");
   const title = document.querySelector('title');
 
-  test("The body tag should not contains any inline style", ()=> {
+  test("The body tag should not contain any inline style", ()=> {
     document.querySelector(
       "head"
     ).innerHTML = `<style>
${css.toString()}</style>`;
@@ -19,7 +19,7 @@ describe("All the styles should be applied", ()=> {
     expect(body.style._values).toEqual(emptyBodyInlineStyle);
   });
 
-  test("the width should be '50px'", ()=> {
+  test("The width should be '50px'", ()=> {
     // get computed styles of any element you like
     document.querySelector(
       "head"
@@ -37,7 +37,7 @@ describe("All the styles should be applied", ()=> {
     expect(orangeHoverSelector).toBe('50px');
   });
 
-  test("the height should be '50px'", ()=> {
+  test("The height should be '50px'", ()=> {
     // get computed styles of any element you like
     document.querySelector(
       "head"
@@ -55,7 +55,7 @@ describe("All the styles should be applied", ()=> {
     expect(orangeHoverSelector).toBe('50px');
   });
 
-  test("the background-size should be contain", ()=> {
+  test("The background-size should be contain", ()=> {
     document.querySelector(
       "head"
     ).innerHTML = `<style>
${css.toString()}</style>`;
@@ -72,7 +72,7 @@ describe("All the styles should be applied", ()=> {
     expect(orangeHoverSelector).toBe('contain');
   });
 
-  test("the background should include the shorthand property", ()=> {
+  test("The background should include the shorthand property", ()=> {
     document.querySelector(
       "head"
     ).innerHTML = `<style>
${css.toString()}</style>`;
@@ -102,7 +102,7 @@ describe("All the styles should be applied", ()=> {
     expect(orangeHoverSelector).toContain('url(https://github.com/4GeeksAcademy/css-tutorial-exercises-course/blob/3a2d1dd03f58167a5a4894155af2d3aa4d41d647/.learn/assets/baby.jpg?raw=true)');
   });
 
-  test("the padding should include the shorthand property in the right order (top, right, bottom, left)", ()=> {
+  test("The padding should include the shorthand property in the right order (top, right, bottom, left)", ()=> {
     document.querySelector(
       "head"
     ).innerHTML = `<style>
${css.toString()}</style>`;

From 08a491a4509132fa2abd86aab6b51c3a18ed28ef Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 21:15:24 +0100
Subject: [PATCH 7/8] Update tests.js

---
 exercises/04.1-Combined-Rules/tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/04.1-Combined-Rules/tests.js b/exercises/04.1-Combined-Rules/tests.js
index 30c66793..8480b590 100644
--- a/exercises/04.1-Combined-Rules/tests.js
+++ b/exercises/04.1-Combined-Rules/tests.js
@@ -55,7 +55,7 @@ describe("All the styles should be applied", ()=> {
     expect(orangeHoverSelector).toBe('50px');
   });
 
-  test("The background-size should be contain", ()=> {
+  test("The background-size should be 'contain'", ()=> {
     document.querySelector(
       "head"
     ).innerHTML = `<style>
${css.toString()}</style>`;

From 7ff6e8b1991e0528cd4c11f3710a6e7d8513df44 Mon Sep 17 00:00:00 2001
From: Jose Mora <109150320+josemoracard@users.noreply.github.com>
Date: Wed, 22 Mar 2023 21:18:09 +0100
Subject: [PATCH 8/8] Update README.md

---
 exercises/04.1-Combined-Rules/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/04.1-Combined-Rules/README.md b/exercises/04.1-Combined-Rules/README.md
index 45e0d3a7..b96b4536 100644
--- a/exercises/04.1-Combined-Rules/README.md
+++ b/exercises/04.1-Combined-Rules/README.md
@@ -4,7 +4,7 @@ tutorial: "https://youtu.be/watch?v=uQS5QeEE-B4"
 
 # `04.1` Combined Rules
 
-CSS files take up space on your server and also take time to download (like everything); it is yet another text document that the browser has to download before rendering the page, which is why it is important to keep the CSS document as small as possible.
+CSS files take up space on your server and also take time to download (like everything); it is yet another text document that the browser has to download before rendering the page, which is why it's important to keep the CSS document as small as possible.
 
 One way to do that is by combining several properties into one, such as with `border`:
 
