Merge upstream, clear conflicts

EC2 Default User · EC2 Default User · commit d770396d7812 · 2016-06-12T07:29:54.000Z
diff --git a/css/stylesheet.css b/css/stylesheet.css
@@ -539,6 +539,10 @@ pre {
     }
 }
 
+input[type="number"] {
+    -moz-appearance: textfield;
+}
+
 input[type=number]::-webkit-inner-spin-button,
 input[type=number]::-webkit-outer-spin-button {
     -webkit-appearance: none;
diff --git a/public/algorithm_visualizer.css b/public/algorithm_visualizer.css
@@ -672,6 +672,10 @@ pre {
     }
 }
 
+input[type="number"] {
+    -moz-appearance: textfield;
+}
+
 input[type=number]::-webkit-inner-spin-button,
 input[type=number]::-webkit-outer-spin-button {
     -webkit-appearance: none;
diff --git a/public/algorithm_visualizer.min.css b/public/algorithm_visualizer.min.css

Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,10 @@ pre {`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`
	`542`	`+input[type="number"] {`
	`543`	`+ -moz-appearance: textfield;`
	`544`	`+}`
	`545`	`+`
`542`	`546`	`input[type=number]::-webkit-inner-spin-button,`
`543`	`547`	`input[type=number]::-webkit-outer-spin-button {`
`544`	`548`	`-webkit-appearance: none;`
Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,10 @@ pre {`
`672`	`672`	`}`
`673`	`673`	`}`
`674`	`674`
	`675`	`+input[type="number"] {`
	`676`	`+ -moz-appearance: textfield;`
	`677`	`+}`
	`678`	`+`
`675`	`679`	`input[type=number]::-webkit-inner-spin-button,`
`676`	`680`	`input[type=number]::-webkit-outer-spin-button {`
`677`	`681`	`-webkit-appearance: none;`