Resolved merge conflicts
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/examples.html b/examples.html
index 5b84572..0ab3680 100644
--- a/examples.html
+++ b/examples.html
@@ -52,7 +52,7 @@
<h2>XML prolog</h2>
<pre class="prism"><code class="language-markup"><?xml version="1.0" encoding="utf-8"?>
<svg></svg></code></pre>
-
+
<h2>DOCTYPE</h2>
<pre class="prism"><code class="language-markup"><!DOCTYPE html>
<html></html></code></pre>
@@ -61,6 +61,14 @@
<pre class="prism"><code class="language-markup"><ns1:description><![CDATA[
CDATA is <not> magical.
]]></ns1:description></code></pre>
+
+ <h2>Comment</h2>
+ <pre class="prism"><code class="language-markup"><!-- I'm a comment -->
+And i'm not</code></pre>
+
+ <h2>Entities</h2>
+ <pre class="prism"><code class="language-markup">&amp; &#160; &#x152;</code></pre>
+
</pre>
</section>
@@ -71,9 +79,20 @@
<pre class="prism"><code class="language-css">*{}</code></pre>
<pre class="prism"><code class="language-css">* {}</code></pre>
<pre class="prism"><code class="language-css">p {}</code></pre>
+ <pre class="prism"><code class="language-css">ul,
+ol {}</code></pre>
<h2>Simple rule</h2>
<pre class="prism"><code class="language-css">p { color: red; }</code></pre>
+
+ <h2>Important rule</h2>
+ <pre class="prism"><code class="language-css">p { color: red !important; }</code></pre>
+
+ <h2>@ rule</h2>
+ <pre class="prism"><code class="language-css">@media screen and (min-width: 100px) {}</code></pre>
+
+ <h2>Comment</h2>
+ <pre class="prism"><code class="language-css">/* Simple comment here */</code></pre>
</pre>
</section>