From 9470ff2dccc4f088aecb0a20d360a40d866c63bf Mon Sep 17 00:00:00 2001
From: kristi <kristi.dev@gmail.com>
Date: Fri, 4 May 2012 15:39:47 -0700
Subject: [PATCH 1/3] fix the sidebar editor

---
 lib/gollum/frontend/public/gollum/css/editor.css | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/gollum/frontend/public/gollum/css/editor.css b/lib/gollum/frontend/public/gollum/css/editor.css
index cadd47bc..9687a3a8 100755
--- a/lib/gollum/frontend/public/gollum/css/editor.css
+++ b/lib/gollum/frontend/public/gollum/css/editor.css
@@ -233,6 +233,7 @@ a#function-help:hover span { background-position: -405px -28px; }
 
 /* @section form-fields */
 
+#gollum-editor textarea#gollum-editor-sidebar,
 #gollum-editor textarea#gollum-editor-body {
   background: #fff;
   border: 1px solid #ddd;
@@ -330,12 +331,15 @@ a#function-help:hover span { background-position: -405px -28px; }
   font-size: 1.6em;
   float: left;
   margin: 0;
-  padding: 0.4em 0 0 0.3em;
+  padding: 0.15em 0 0 0.3em;
   text-shadow: 0 -1px 0 #fff;
 }
+#gollum-editor .collapsed h4 {
+  color: #bbb;
+}
 
 #gollum-editor .collapsed a.button:hover,
-#gollum-editor .expanded h4 a.button:hover {
+#gollum-editor .expanded  a.button:hover {
   color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
   text-decoration: none;

From f022b3fcde58cf7035320ed48e3564c2455b5468 Mon Sep 17 00:00:00 2001
From: kristi <kristi.dev@gmail.com>
Date: Sun, 6 May 2012 16:28:45 -0700
Subject: [PATCH 2/3] Use github markup for page and sidebar content

---
 .../frontend/public/gollum/css/gollum.css     |  30 +-
 .../frontend/public/gollum/css/template.css   | 796 +++++++++++-------
 lib/gollum/frontend/templates/page.mustache   |   6 +-
 3 files changed, 502 insertions(+), 330 deletions(-)

diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css
index 7028b9b7..47090918 100755
--- a/lib/gollum/frontend/public/gollum/css/gollum.css
+++ b/lib/gollum/frontend/public/gollum/css/gollum.css
@@ -86,6 +86,7 @@ a:hover, a:visited {
     float: right;
     padding: 7px;
     width: 25%;
+    color: #555;
 
     border-radius: 0.5em;
     -moz-border-radius: 0.5em;
@@ -97,7 +98,7 @@ a:hover, a:visited {
     }
 
       #wiki-rightbar > p:first-child {
-        margin-top: 0;
+        margin-top: 10px;
       }
 
     #wiki-rightbar p.parent {
@@ -114,33 +115,6 @@ a:hover, a:visited {
       content: "← ";
     }
 
-    #wiki-rightbar h3 {
-      font-size: 1.2em;
-      color: #333;
-      margin: 1.2em 0 0;
-      padding: 0;
-      text-shadow: 0 1px 0 #fff;
-    }
-
-    #wiki-rightbar ul {
-      margin: 0.5em 0 1em;
-      padding: 0;
-    }
-
-    #wiki-rightbar ul li {
-      color: #bbb;
-      margin: 0 0 0 1em;
-      padding: 0;
-      line-height: 1.75em;
-      list-style-position: inside;
-      list-style-type: round;
-    }
-
-    #wiki-rightbar #nav ul li a {
-      font-weight: bold;
-      text-shadow: 0 1px 0 #fff;
-    }
-
   /* @section footer */
 
   #wiki-footer {
diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css
index 398546f2..084a0768 100644
--- a/lib/gollum/frontend/public/gollum/css/template.css
+++ b/lib/gollum/frontend/public/gollum/css/template.css
@@ -22,361 +22,557 @@ img {
   border: 0;
 }
 
+a.absent {
+  color: #c00;
+}
+
 #template {
   font-size: 14px;
   line-height: 1.6;
   margin-bottom: 40px;
 }
 
-/* Link Colors */
-a.absent {
-  color: #c00;
-}
-
-/* Primary Body Copy */
-#template p {
-  margin: 1.4em 0;
-  padding: 0;
-}
-
-  /* ReST first graf in nested list */
-  #template * li p.first {
-    display: inline-block;
-  }
-
-/* Headings */
-#template h1, #template h2, #template h3,
-#template h4, #template h5, #template h6 {
-  margin: 0;
-  padding: 0;
-}
-
-#template h1 {
-  font-size: 28px;
-  line-height: normal;
-  padding: 10px 0 0 0;
-  margin: 30px 0 10px;
-}
-
-#template h2 {
-  border-bottom: 1px solid #ddd;
-  font-size: 22px;
+.markdown-body {
+  font-size: 14px;
   line-height: 1.6;
-  margin: 22px 0 10px;
-  padding: 7px 0 0;
 }
-
-#template h3 {
-  font-size: 16px;
-  line-height: 26px;
-  padding: 26px 0 0;
+.markdown-body>*:first-child {
+  margin-top: 0!important
 }
-
-#template h4 {
-  font-size: 14px;
-  line-height: 26px;
-  padding: 18px 0 4px;
-  font-weight: bold;
-  text-transform: uppercase;
+.markdown-body>*:last-child {
+  margin-bottom: 0!important
 }
-
-#template h5 {
-  font-size: 13px;
-  line-height: 26px;
-  margin-bottom: -19px;
-  padding: 14px 0 0;
-  font-weight: bold;
-  text-transform: uppercase;
+.markdown-body a.absent {
+  color: #c00
 }
-
-#template h6 {
-  color: #666;
-  font-size: 14px;
-  line-height: 26px;
-  margin-bottom: -19px;
-  padding: 18px 0 0;
-  font-weight: normal;
-  font-variant: italic;
-}
-
-#template hr {
-  background-color: #ccc;
-  color: #ccc;
-  border: 2px solid #ccc;
-  margin: 20px 0;
-  padding: 0;
-}
-
-  /* Border Reset for headers with horizontal rules */
-  #template > h2:first-child,
-  #template > h1:first-child {
-    margin: 12px 0 10px;
-    padding: 10px 0 10px;
-  }
-
-
-/* Lists, Blockquotes & Such */
-#template ul,
-#template ol {
-  margin: 15px 0;
+.markdown-body a.anchor {
+  display: block;
   padding-left: 30px;
+  margin-left: -30px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
 }
-
-  /* Nested Lists */
-  #template ul li,
-  #template ol li,
-  #template ul li ul,
-  #template ol li ol,
-  #template ul li ol,
-  #template ol li ul,
-  #template ul ul,
-  #template ol ol {
-    padding: 0;
-    margin: 15px 0;
-  }
-
-#template dl {
-  margin: 0;
-  padding: 20px 0 0;
+.markdown-body h1,
+.markdown-body h2,
+.markdown-body h3,
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  margin: 20px 0 10px;
+  padding: 0;
+  font-weight: bold;
+  -webkit-font-smoothing: antialiased;
+  cursor: text;
+  position: relative;
 }
-
-  #template dl dt {
-    font-size: 14px;
-    font-weight: bold;
-    line-height: normal;
-    margin: 0;
-    padding: 20px 0 0;
-  }
-
-    #template dl dt:first-child {
-      padding: 0;
-    }
-
-  #template dl dd {
-    font-size: 13px;
-    margin: 0;
-    padding: 3px 0 0;
-  }
-
-/* Tables */
-#template table {
-  border-collapse: collapse;
-  margin: 20px 0 0;
+.markdown-body h1:hover a.anchor,
+.markdown-body h2:hover a.anchor,
+.markdown-body h3:hover a.anchor,
+.markdown-body h4:hover a.anchor,
+.markdown-body h5:hover a.anchor,
+.markdown-body h6:hover a.anchor {
+  background: url('../../images/modules/styleguide/para.png') no-repeat 10px center;
+  text-decoration: none;
+}
+.markdown-body h1 tt,
+.markdown-body h1 code,
+.markdown-body h2 tt,
+.markdown-body h2 code,
+.markdown-body h3 tt,
+.markdown-body h3 code,
+.markdown-body h4 tt,
+.markdown-body h4 code,
+.markdown-body h5 tt,
+.markdown-body h5 code,
+.markdown-body h6 tt,
+.markdown-body h6 code {
+  font-size: inherit
+}
+.markdown-body h1 {
+  font-size: 28px;
+  color: #000;
+}
+.markdown-body h2 {
+  font-size: 24px;
+  border-bottom: 1px solid #ccc;
+  color: #000;
+}
+.markdown-body h3 {
+  font-size: 18px
+}
+.markdown-body h4 {
+  font-size: 16px
+}
+.markdown-body h5 {
+  font-size: 14px
+}
+.markdown-body h6 {
+  color: #777;
+  font-size: 14px;
+}
+.markdown-body p,
+.markdown-body blockquote,
+.markdown-body ul,
+.markdown-body ol,
+.markdown-body dl,
+.markdown-body li,
+.markdown-body table,
+.markdown-body pre {
+  margin: 15px 0
+}
+.markdown-body hr {
+  background: transparent url('../../images/modules/pulls/dirty-shade.png') repeat-x 0 0;
+  border: 0 none;
+  color: #ccc;
+  height: 4px;
   padding: 0;
 }
-
-#template table * tr {
+.markdown-body>h2:first-child,
+.markdown-body>h1:first-child,
+.markdown-body>h1:first-child+h2,
+.markdown-body>h3:first-child,
+.markdown-body>h4:first-child,
+.markdown-body>h5:first-child,
+.markdown-body>h6:first-child {
+  margin-top: 0;
+  padding-top: 0;
+}
+.markdown-body a:first-child h1,
+.markdown-body a:first-child h2,
+.markdown-body a:first-child h3,
+.markdown-body a:first-child h4,
+.markdown-body a:first-child h5,
+.markdown-body a:first-child h6 {
+  margin-top: 0;
+  padding-top: 0;
+}
+.markdown-body h1+p,
+.markdown-body h2+p,
+.markdown-body h3+p,
+.markdown-body h4+p,
+.markdown-body h5+p,
+.markdown-body h6+p {
+  margin-top: 0
+}
+.markdown-body li p.first {
+  display: inline-block
+}
+.markdown-body ul,
+.markdown-body ol {
+  padding-left: 30px
+}
+.markdown-body ul li>:first-child,
+.markdown-body ol li>:first-child {
+  margin-top: 0
+}
+.markdown-body ul li>:last-child,
+.markdown-body ol li>:last-child {
+  margin-bottom: 0
+}
+.markdown-body dl {
+  padding: 0
+}
+.markdown-body dl dt {
+  font-size: 14px;
+  font-weight: bold;
+  font-style: italic;
+  padding: 0;
+  margin: 15px 0 5px;
+}
+.markdown-body dl dt:first-child {
+  padding: 0
+}
+.markdown-body dl dt>:first-child {
+  margin-top: 0
+}
+.markdown-body dl dt>:last-child {
+  margin-bottom: 0
+}
+.markdown-body dl dd {
+  margin: 0 0 15px;
+  padding: 0 15px;
+}
+.markdown-body dl dd>:first-child {
+  margin-top: 0
+}
+.markdown-body dl dd>:last-child {
+  margin-bottom: 0
+}
+.markdown-body blockquote {
+  border-left: 4px solid #DDD;
+  padding: 0 15px;
+  color: #777;
+}
+.markdown-body blockquote>:first-child {
+  margin-top: 0
+}
+.markdown-body blockquote>:last-child {
+  margin-bottom: 0
+}
+.markdown-body table {
+  padding: 0
+}
+.markdown-body table tr {
   border-top: 1px solid #ccc;
   background-color: #fff;
   margin: 0;
   padding: 0;
 }
-
-  #template table * tr:nth-child(2n) {
-    background-color: #f8f8f8;
-  }
-
-  #template table * tr th,
-  #template table * tr td {
-    border: 1px solid #ccc;
-    text-align: left;
-    margin: 0;
-    padding: 6px 13px;
-  }
-
-/* Images & Stuff */
-#template img {
-  max-width: 100%;
+.markdown-body table tr:nth-child(2n) {
+  background-color: #f8f8f8
 }
-
-/* Gollum Image Tags */
-
-/* Framed */
-#template span.frame {
+.markdown-body table tr th {
+  font-weight: bold
+}
+.markdown-body table tr th,
+.markdown-body table tr td {
+  border: 1px solid #ccc;
+  text-align: left;
+  margin: 0;
+  padding: 6px 13px;
+}
+.markdown-body table tr th>:first-child,
+.markdown-body table tr td>:first-child {
+  margin-top: 0
+}
+.markdown-body table tr th>:last-child,
+.markdown-body table tr td>:last-child {
+  margin-bottom: 0
+}
+.markdown-body img {
+  max-width: 100%
+}
+.markdown-body span.frame {
   display: block;
   overflow: hidden;
 }
-
-  #template span.frame > span {
-    border: 1px solid #ddd;
-    display: block;
-    float: left;
-    overflow: hidden;
-    margin: 13px 0 0;
-    padding: 7px;
-    width: auto;
-  }
-
-  #template span.frame span img {
-    display: block;
-    float: left;
-  }
-
-  #template span.frame span span {
-    clear: both;
-    color: #333;
-    display: block;
-    padding: 5px 0 0;
-  }
-
-#template span.align-center {
+.markdown-body span.frame>span {
+  border: 1px solid #ddd;
+  display: block;
+  float: left;
+  overflow: hidden;
+  margin: 13px 0 0;
+  padding: 7px;
+  width: auto;
+}
+.markdown-body span.frame span img {
+  display: block;
+  float: left;
+}
+.markdown-body span.frame span span {
+  clear: both;
+  color: #333;
+  display: block;
+  padding: 5px 0 0;
+}
+.markdown-body span.align-center {
   display: block;
   overflow: hidden;
   clear: both;
 }
-
-  #template span.align-center > span {
-    display: block;
-    overflow: hidden;
-    margin: 13px auto 0;
-    text-align: center;
-  }
-
-  #template span.align-center span img {
-    margin: 0 auto;
-    text-align: center;
-  }
-
-#template span.align-right {
+.markdown-body span.align-center>span {
+  display: block;
+  overflow: hidden;
+  margin: 13px auto 0;
+  text-align: center;
+}
+.markdown-body span.align-center span img {
+  margin: 0 auto;
+  text-align: center;
+}
+.markdown-body span.align-right {
   display: block;
   overflow: hidden;
   clear: both;
 }
-
-  #template span.align-right > span {
-    display: block;
-    overflow: hidden;
-    margin: 13px 0 0;
-    text-align: right;
-  }
-
-  #template span.align-right span img {
-    margin: 0;
-    text-align: right;
-  }
-
-#template span.float-left {
+.markdown-body span.align-right>span {
+  display: block;
+  overflow: hidden;
+  margin: 13px 0 0;
+  text-align: right;
+}
+.markdown-body span.align-right span img {
+  margin: 0;
+  text-align: right;
+}
+.markdown-body span.float-left {
   display: block;
   margin-right: 13px;
   overflow: hidden;
   float: left;
 }
-
-  #template span.float-left span {
-    margin: 13px 0 0;
-  }
-
-#template span.float-right {
+.markdown-body span.float-left span {
+  margin: 13px 0 0
+}
+.markdown-body span.float-right {
   display: block;
   margin-left: 13px;
   overflow: hidden;
   float: right;
 }
-
-  #template span.float-right > span {
-    display: block;
-    overflow: hidden;
-    margin: 13px auto 0;
-    text-align: right;
-  }
-
-
-/* Code */
-#template code, #template tt {
+.markdown-body span.float-right>span {
+  display: block;
+  overflow: hidden;
+  margin: 13px auto 0;
+  text-align: right;
+}
+.markdown-body code,
+.markdown-body tt {
+  margin: 0 2px;
+  padding: 0 5px;
+  white-space: nowrap;
+  border: 1px solid #eaeaea;
   background-color: #f8f8f8;
-  border: 1px solid #dedede;
-  font-size: 13px;
-  padding: 1px 5px;
-
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-
-#template .highlight pre, #template pre {
+.markdown-body pre>code {
+  margin: 0;
+  padding: 0;
+  white-space: pre;
+  border: none;
+  background: transparent;
+}
+.markdown-body .highlight pre,
+.markdown-body pre {
   background-color: #f8f8f8;
   border: 1px solid #ccc;
   font-size: 13px;
   line-height: 19px;
   overflow: auto;
   padding: 6px 10px;
-
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-
-pre, code {
-  font: 12px 'Bitstream Vera Sans Mono','Courier',monospace
-}
-
-#template pre code, #template pre tt {
+.markdown-body pre code,
+.markdown-body pre tt {
   background-color: transparent;
   border: none;
-  padding: 0;
 }
 
-/*
-  Highlight rules from pull req 191
-  https://github.com/eboto/gollum/commit/5df09477abf4a04c82c7fcaa2bd7ee2a85e7ec82
-*/
-#template .highlight { background:#fff; }
-#template .highlight .c { color:#998;font-style:italic; }
-#template .highlight .err { color:#a61717;background-color:#e3d2d2; }
-#template .highlight .k { font-weight:bold; }
-#template .highlight .o { font-weight:bold; }
-#template .highlight .cm { color:#998;font-style:italic; }
-#template .highlight .cp { color:#999;font-weight:bold; }
-#template .highlight .c1 { color:#998;font-style:italic; }
-#template .highlight .cs { color:#999;font-weight:bold;font-style:italic; }
-#template .highlight .gd { color:#000;background-color:#fdd; }
-#template .highlight .gd .x { color:#000;background-color:#faa; }
-#template .highlight .ge { font-style:italic; }
-#template .highlight .gr { color:#a00; }
-#template .highlight .gh { color:#999; }
-#template .highlight .gi { color:#000;background-color:#dfd; }
-#template .highlight .gi .x { color:#000;background-color:#afa; }
-#template .highlight .go { color:#888; }
-#template .highlight .gp { color:#555; }
-#template .highlight .gs { font-weight:bold; }
-#template .highlight .gu { color:#800080;font-weight:bold; }
-#template .highlight .gt { color:#a00; }
-#template .highlight .kc { font-weight:bold; }
-#template .highlight .kd { font-weight:bold; }
-#template .highlight .kp { font-weight:bold; }
-#template .highlight .kr { font-weight:bold; }
-#template .highlight .kt { color:#458;font-weight:bold; }
-#template .highlight .m { color:#099; }
-#template .highlight .s { color:#d14; }
-#template .highlight .na { color:#008080; }
-#template .highlight .nb { color:#0086B3; }
-#template .highlight .nc { color:#458;font-weight:bold; }
-#template .highlight .no { color:#008080; }
-#template .highlight .ni { color:#800080; }
-#template .highlight .ne { color:#900;font-weight:bold; }
-#template .highlight .nf { color:#900;font-weight:bold; }
-#template .highlight .nn { color:#555; }
-#template .highlight .nt { color:#000080; }
-#template .highlight .nv { color:#008080; }
-#template .highlight .ow { font-weight:bold; }
-#template .highlight .w { color:#bbb; }
-#template .highlight .mf { color:#099; }
-#template .highlight .mh { color:#099; }
-#template .highlight .mi { color:#099; }
-#template .highlight .mo { color:#099; }
-#template .highlight .sb { color:#d14; }
-#template .highlight .sc { color:#d14; }
-#template .highlight .sd { color:#d14; }
-#template .highlight .s2 { color:#d14; }
-#template .highlight .se { color:#d14; }
-#template .highlight .sh { color:#d14; }
-#template .highlight .si { color:#d14; }
-#template .highlight .sx { color:#d14; }
-#template .highlight .sr { color:#009926; }
-#template .highlight .s1 { color:#d14; }
-#template .highlight .ss { color:#990073; }
-#template .highlight .bp { color:#999; }
-#template .highlight .vc { color:#008080; }
-#template .highlight .vg { color:#008080; }
-#template .highlight .vi { color:#008080; }
-#template .highlight .il { color:#099; }
+.highlight {
+    background: #fff
+}
+.highlight .c {
+    color: #998;
+    font-style: italic;
+}
+.highlight .err {
+    color: #a61717;
+    background-color: #e3d2d2;
+}
+.highlight .k {
+    font-weight: bold
+}
+.highlight .o {
+    font-weight: bold
+}
+.highlight .cm {
+    color: #998;
+    font-style: italic;
+}
+.highlight .cp {
+    color: #999;
+    font-weight: bold;
+}
+.highlight .c1 {
+    color: #998;
+    font-style: italic;
+}
+.highlight .cs {
+    color: #999;
+    font-weight: bold;
+    font-style: italic;
+}
+.highlight .gd {
+    color: #000;
+    background-color: #fdd;
+}
+.highlight .gd .x {
+    color: #000;
+    background-color: #faa;
+}
+.highlight .ge {
+    font-style: italic
+}
+.highlight .gr {
+    color: #a00
+}
+.highlight .gh {
+    color: #999
+}
+.highlight .gi {
+    color: #000;
+    background-color: #dfd;
+}
+.highlight .gi .x {
+    color: #000;
+    background-color: #afa;
+}
+.highlight .go {
+    color: #888
+}
+.highlight .gp {
+    color: #555
+}
+.highlight .gs {
+    font-weight: bold
+}
+.highlight .gu {
+    color: #800080;
+    font-weight: bold;
+}
+.highlight .gt {
+    color: #a00
+}
+.highlight .kc {
+    font-weight: bold
+}
+.highlight .kd {
+    font-weight: bold
+}
+.highlight .kn {
+    font-weight: bold
+}
+.highlight .kp {
+    font-weight: bold
+}
+.highlight .kr {
+    font-weight: bold
+}
+.highlight .kt {
+    color: #458;
+    font-weight: bold;
+}
+.highlight .m {
+    color: #099
+}
+.highlight .s {
+    color: #d14
+}
+.highlight .na {
+    color: #008080
+}
+.highlight .nb {
+    color: #0086B3
+}
+.highlight .nc {
+    color: #458;
+    font-weight: bold;
+}
+.highlight .no {
+    color: #008080
+}
+.highlight .ni {
+    color: #800080
+}
+.highlight .ne {
+    color: #900;
+    font-weight: bold;
+}
+.highlight .nf {
+    color: #900;
+    font-weight: bold;
+}
+.highlight .nn {
+    color: #555
+}
+.highlight .nt {
+    color: #000080
+}
+.highlight .nv {
+    color: #008080
+}
+.highlight .ow {
+    font-weight: bold
+}
+.highlight .w {
+    color: #bbb
+}
+.highlight .mf {
+    color: #099
+}
+.highlight .mh {
+    color: #099
+}
+.highlight .mi {
+    color: #099
+}
+.highlight .mo {
+    color: #099
+}
+.highlight .sb {
+    color: #d14
+}
+.highlight .sc {
+    color: #d14
+}
+.highlight .sd {
+    color: #d14
+}
+.highlight .s2 {
+    color: #d14
+}
+.highlight .se {
+    color: #d14
+}
+.highlight .sh {
+    color: #d14
+}
+.highlight .si {
+    color: #d14
+}
+.highlight .sx {
+    color: #d14
+}
+.highlight .sr {
+    color: #009926
+}
+.highlight .s1 {
+    color: #d14
+}
+.highlight .ss {
+    color: #990073
+}
+.highlight .bp {
+    color: #999
+}
+.highlight .vc {
+    color: #008080
+}
+.highlight .vg {
+    color: #008080
+}
+.highlight .vi {
+    color: #008080
+}
+.highlight .il {
+    color: #099
+}
+.highlight .gc {
+    color: #999;
+    background-color: #EAF2F5;
+}
+.type-csharp .highlight .k {
+    color: #00F
+}
+.type-csharp .highlight .kt {
+    color: #00F
+}
+.type-csharp .highlight .nf {
+    color: #000;
+    font-weight: normal;
+}
+.type-csharp .highlight .nc {
+    color: #2B91AF
+}
+.type-csharp .highlight .nn {
+    color: #000
+}
+.type-csharp .highlight .s {
+    color: #A31515
+}
+.type-csharp .highlight .sc {
+    color: #A31515
+}
diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index 8d29fb4c..75b7a830 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -20,13 +20,15 @@
 <div id="wiki-content">
 <div class="wrap {{#has_footer}} has-footer {{/has_footer}} {{#has_sidebar}}  has-rightbar{{/has_sidebar}}">
   <div id="wiki-body" class="gollum-{{format}}-content">
-    <div id="template">
+    <div class="markdown-body">
       {{{content}}}
     </div>
   </div>
   {{#has_sidebar}}
   <div id="wiki-rightbar" class="gollum-{{sidebar_format}}-content">
-    {{{sidebar_content}}}
+    <div class="markdown-body">
+      {{{sidebar_content}}}
+    </div>
   </div>
   {{/has_sidebar}}
   {{#has_footer}}

From 857ca14499bf7115d4914d41e289c09045b28c75 Mon Sep 17 00:00:00 2001
From: kristi <kristi.dev@gmail.com>
Date: Sun, 6 May 2012 16:36:09 -0700
Subject: [PATCH 3/3] add bottom margin to wiki-page css

---
 lib/gollum/frontend/public/gollum/css/gollum.css   | 1 +
 lib/gollum/frontend/public/gollum/css/template.css | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css
index 47090918..26adf4c1 100755
--- a/lib/gollum/frontend/public/gollum/css/gollum.css
+++ b/lib/gollum/frontend/public/gollum/css/gollum.css
@@ -71,6 +71,7 @@ a:hover, a:visited {
     display: block;
     float: left;
     margin-right: 3%;
+    margin-bottom: 40px;
     width: 100%;
   }
 
diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css
index 084a0768..e00df341 100644
--- a/lib/gollum/frontend/public/gollum/css/template.css
+++ b/lib/gollum/frontend/public/gollum/css/template.css
@@ -26,12 +26,6 @@ a.absent {
   color: #c00;
 }
 
-#template {
-  font-size: 14px;
-  line-height: 1.6;
-  margin-bottom: 40px;
-}
-
 .markdown-body {
   font-size: 14px;
   line-height: 1.6;