Merge branch 'master' of https://github.com/khan4019/front-end-Interview-Questions

khan4019 · khan4019 · commit aeff1e368014 · 2017-04-16T09:27:12.000-05:00
# Conflicts:
#	README.md
diff --git a/README.md b/README.md
@@ -52,8 +52,8 @@ ____________
   1. Does padding-top or padding-bottom has effect on inline element?
   1. Does padding-left or padding-right or margin-left or margin-right has effect on inline element?
   1. If you have a &lt;p&gt; element with font-size: 10rem, will the text be responsive when the user resizes / drags the browser window?
-  1. The pseudo class :checked will select inputs with type radio or checkbox, but not
-  1. In a HTML document, the pseudo class :root always refers to the element.
+  1. The pseudo class :checked will select inputs with type radio or checkbox, but not &lt;option&gt; elements.
+  1. In a HTML document, the pseudo class :root always refers to the &lt;html&gt; element.
   1. The translate() function can move the position of an element on the z-axis.
 1. Which one would you prefer among px, em % or pt and why?
 1. How absolute, relative, fixed and static position differ?
@@ -116,7 +116,7 @@ __________________
 1. Find the largest sum of any two elements?
 1. Total number of zeros from 1 upto n?
 1. Check whether a given string is a substring of bigger string
-2. Get permutaitons of a string
+2. Get permutations of a string
 
 #### [JS: Answer for Algorithm Beginners Level](http://www.thatjsdude.com/interview/js1.html)
 
@@ -151,7 +151,11 @@ __________________
 
 
 
+<<<<<<< HEAD
 ## [html: Basic Questions for Begginers](http://www.thatjsdude.com/interview/html.html)
+=======
+##[html: Basic Questions for Beginners](http://www.thatjsdude.com/interview/html.html)
+>>>>>>> e8380b49e13b19166a7b548487515285eb456c16
 15 basic questions and asnwers
 ______
 1. Why do you need doctype?
diff --git a/css.html b/css.html
@@ -221,8 +221,8 @@ <h3>List of Questions</h3>
         <li class="skipListItem blueish"><a href="#rapidFire">Does padding-top or padding-bottom has effect on inline element?</a></li>
         <li class="skipListItem blueish"><a href="#rapidFire">Does padding-left or padding-right or margin-left or margin-right has effect on inline element?</a></li>
         <li  class="skipListItem blueish"><a href="#rapidFire">If you have a &lt;p&gt; element with font-size: 10rem, will the text be responsive when the user resizes / drags the browser window?</a></li>
-        <li  class="skipListItem blueish"><a href="#rapidFire">The pseudo class :checked will select inputs with type radio or checkbox, but not <option> elements.</a></li>
-        <li  class="skipListItem blueish"><a href="#rapidFire">In a HTML document, the pseudo class :root always refers to the <html> element.</a></li>
+        <li  class="skipListItem blueish"><a href="#rapidFire">The pseudo class :checked will select inputs with type radio or checkbox, but not &lt;option&gt; elements.</a></li>
+        <li  class="skipListItem blueish"><a href="#rapidFire">In a HTML document, the pseudo class :root always refers to the &lt;html&gt; element.</a></li>
         <li  class="skipListItem blueish"><a href="#rapidFire">The translate() function can move the position of an element on the z-axis.</a></li>
         <li value="4"><a href="#units">Which one would you prefer among px, em % or pt and why?</a></li>
         <li><a href="#position">How absolute, relative, fixed and static position differ?</a></li>        
diff --git a/html.html b/html.html
@@ -137,7 +137,7 @@ <h2>5. mark</h2>
 <div id="scopped">
   <h2>6. scoped</h2>
   <p><strong>Question:</strong> Can u apply css rule to a part of html document?</p>
-  <p><strong>Answer:</strong> yes. by using "scopped" in the style tag.</p>
+  <p><strong>Answer:</strong> yes. by using "scoped" in the style tag.</p>
    ref <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/style">MDN: style</a>
 </div>
 <div id="http_request">
diff --git a/todo.html b/todo.html
@@ -0,0 +1,3 @@
+<ul>
+  <li>read this <a href="https://blog.devmastery.com/how-to-win-the-coding-interview-71ae7102d685#.h30qv3u5t">here</a></li>
+<ul>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<ul>`
	`2`	`+ <li>read this <a href="https://blog.devmastery.com/how-to-win-the-coding-interview-71ae7102d685#.h30qv3u5t">here</a></li>`
	`3`	`+<ul>`