Merge pull request #139 from bogdanbacosca/sync-29216730

Sync 2921673

Author: bogdanbacosca

2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/article.md

@@ -52,11 +52,7 @@ That's good for performance, because there may be many intermediate elements. We
 
 On the other hand, we should keep in mind that the mouse pointer doesn't "visit" all elements along the way. It can "jump".
 
-<<<<<<< HEAD
-![](mouseover-mouseout-from-outside.svg)
-=======
 In particular, it's possible that the pointer jumps right inside the middle of the page from out of the window. In that case `relatedTarget` is `null`, because it came from "nowhere":
->>>>>>> 852ee189170d9022f67ab6d387aeae76810b5923
 
 ![](mouseover-mouseout-from-outside.svg)
 
@@ -76,21 +72,13 @@ In case of fast mouse movements, intermediate elements may be ignored, but one t
 
 ## Mouseout when leaving for a child
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-![](mouseover-to-child.svg)
-=======
-An important feature of `mouseout` -- it triggers, when the pointer moves from an element to its descendant.
->>>>>>> 852ee189170d9022f67ab6d387aeae76810b5923
-=======
 An important feature of `mouseout` -- it triggers, when the pointer moves from an element to its descendant, e.g. from `#parent` to `#child` in this HTML:
 
 ```html
 <div id="parent">
   <div id="child">...</div>
 </div>
 ```
->>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
 
 If we're on `#parent` and then move the pointer deeper into `#child`, we get `mouseout` on `#parent`!
 

2-ui/99-ui-misc/03-event-loop/article.md

@@ -303,18 +303,7 @@ Here's an example with "counting progress bar", similar to the one shown previou
 
 ## Summary
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-The richer event loop picture may look like this:
-
-![](eventLoop-full.svg)
-
-=======
->>>>>>> 852ee189170d9022f67ab6d387aeae76810b5923
-The more detailed algorithm of the event loop (though still simplified compare to the [specification](https://html.spec.whatwg.org/multipage/webappapis.html#event-loop-processing-model)):
-=======
 A more detailed event loop algorithm (though still simplified compared to the [specification](https://html.spec.whatwg.org/multipage/webappapis.html#event-loop-processing-model)):
->>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
 
 1. Dequeue and run the oldest task from the *macrotask* queue (e.g. "script").
 2. Execute all *microtasks*:

README.md

@@ -1,11 +1,6 @@
-# The Modern JavaScript Tutorial in Romanian
-
-<<<<<<< HEAD
-This repository hosts the translation of <https://javascript.info> in Romanian.
-=======
-This repository hosts the English content of the Modern JavaScript Tutorial, published in [https://javascript.info](https://javascript.info).
->>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
+# The Modern JavaScript Tutorial in *Romanian*
 
+This repository hosts the Romanian content of the Modern JavaScript Tutorial, published in [https://javascript.info](https://javascript.info).
 
 **That's how you can contribute:**
 
@@ -27,11 +22,7 @@ If maintainers do not respond, or if you'd like to become a maintainer, write us
 
 🎉 Thank you!
 
-<<<<<<< HEAD
-Your name and the contribution size will appear in the "About project" page when the translation gets published.
-=======
 **You can edit the text in any editor.** The tutorial uses enhanced "markdown" format, easy to grasp. And if you want to see how it looks on-site, there's a server to run the tutorial locally at <https://github.com/javascript-tutorial/server>.
->>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
 
 P.S. The full list of languages can be found at <https://javascript.info/translate>.
 
@@ -43,9 +34,9 @@ The folder is named `N-url`, where `N` – is the number for sorting (articles a
 
 The folder has one of files:
 
-- `index.md` for a section,
-- `article.md` for an article,
-- `task.md` for a task formulation (+`solution.md` with the solution text if any).
+  - `index.md` stands for a chapter
+  - `article.md` stands for an article
+  - `task.md` stands for a task (solution must be provided in `solution.md` file as well)
 
 A file starts with the `# Title Header`, and then the text in Markdown-like format, editable in a simple text editor. 
 
@@ -81,26 +72,20 @@ document.querySelector('.hello').innerHTML = text;
 ✅ DO (translate comment):
 
 ```js
-// Ejemplo
-const text = 'Hola mundo';
+// Exemplul
+const text = 'Bună ziua`
 document.querySelector('.hello').innerHTML = text;
 ```
 
 ❌ DON'T (translate class):
 
-<<<<<<< HEAD
 ```js
-// Ejemplo
-const text = 'Hola mundo';
-// ".hello" is a class
+// Exemplu
+const text = 'Bună ziua lume';
+document.querySelector('.salut').innerHTML = text;
+// ".salut" is a class
 // DO NOT TRANSLATE
-document.querySelector('.hola').innerHTML = text;
 ```
-=======
-  - `index.md` stands for a chapter
-  - `article.md` stands for an article
-  - `task.md` stands for a task (solution must be provided in `solution.md` file as well)
->>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
 
 ### External Links
 
@@ -128,8 +113,6 @@ Some files, usually tasks, have YAML metadata at the top, delimited by `---`:
 
 ```md
 importance: 5
-
-<<<<<<< HEAD
 ---
 ...
 ```
@@ -151,8 +134,6 @@ Please don't translate or remove the `[#...]` part, it's for URL anchors.
 You can run the tutorial server locally to see how the translation looks.
 
 The server and install instructions are at <https://github.com/javascript-tutorial/server>. 
-=======
----  
->>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
+
 ♥  
 Ilya Kantor @iliakan