Merge remote-tracking branch 'origin/master'

tpierrain · Dec 31, 2013 · b6a972e · b6a972e
2 parents 9f84c71 + 23b041b
commit b6a972e
Show file tree

Hide file tree

Showing 7 changed files with 218 additions and 60 deletions.
diff --git a/WebSite/.idea/workspace.xml b/WebSite/.idea/workspace.xml
diff --git a/WebSite/css/bootstrap.css b/WebSite/css/bootstrap.css
@@ -974,7 +974,7 @@ pre {
   padding: 0 3px 2px;
   font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
   font-size: 12px;
-  color: #333333;
+  color: #d14;
   -webkit-border-radius: 3px;
      -moz-border-radius: 3px;
           border-radius: 3px;

diff --git a/WebSite/css/csharp.css b/WebSite/css/csharp.css
@@ -0,0 +1,36 @@
+.csharpcode, .csharpcode pre
+{
+	font-size: small;
+	color: black;
+	font-family: Consolas, "Courier New", Courier, Monospace;
+    background-color: #f7f7f9;
+    border: 1px solid #e1e1e8;
+	/*white-space: pre;*/
+}
+
+.csharpcode pre { margin: 0em; }
+
+.csharpcode .rem { color: #008000; }
+
+.csharpcode .kwrd { color: #0000ff; }
+
+.csharpcode .str { color: #a31515; }
+
+.csharpcode .op { color: #0000c0; }
+
+.csharpcode .preproc { color: #cc6633; }
+
+.csharpcode .asp { background-color: #ffff00; }
+
+.csharpcode .html { color: #800000; }
+
+.csharpcode .attr { color: #ff0000; }
+
+.csharpcode .alt 
+{
+	background-color: #f4f4f4;
+	width: 100%;
+	margin: 0em;
+}
+
+.csharpcode .lnum { color: #606060; }
diff --git a/WebSite/img/ErrorSample1.png b/WebSite/img/ErrorSample1.png
diff --git a/WebSite/img/ErrorSample2.png b/WebSite/img/ErrorSample2.png
diff --git a/WebSite/img/ErrorSample3.png b/WebSite/img/ErrorSample3.png