Commit 24958c2fc7c89d0e3051c135788a99169b24fcee

Lea Verou 2012-07-13T02:33:07

Resolved merge conflicts

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">&lt;?xml version="1.0" encoding="utf-8"?>
 &lt;svg>&lt;/svg></code></pre>
-
+	
 	<h2>DOCTYPE</h2>
 	<pre class="prism"><code class="language-markup">&lt;!DOCTYPE html>
 &lt;html>&lt;/html></code></pre>
@@ -61,6 +61,14 @@
 	<pre class="prism"><code class="language-markup">&lt;ns1:description>&lt;![CDATA[
   CDATA is &lt;not> magical.
 ]]>&lt;/ns1:description></code></pre>
+	
+	<h2>Comment</h2>
+	<pre class="prism"><code class="language-markup">&lt;!-- I'm a comment -->
+And i'm not</code></pre>
+	
+	<h2>Entities</h2>
+	<pre class="prism"><code class="language-markup">&amp;amp; &amp;#160; &amp;#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>