Merge branch 'wiki'

public/stylesheets/sass/main.sass

@@ -488,6 +488,7 @@ ul.autocomplete
   top: -1em
   left: 5%
 
+<<<<<<< HEAD:public/stylesheets/sass/main.sass
 // group stats
 .stats-bar
   height: 20px
@@ -495,4 +496,38 @@ ul.autocomplete
   border: 1px solid #DDDDDD
   background-color: #fff
   text-align: center
-  margin: 0 10px 10px 0
+  margin: 0 10px 10px 0
+=======
+// *** wiki
+a.new_wiki_link
+  color: grey
+#preview
+  border: 1px dotted grey
+  padding: 0 1em
+#toc
+  float: right
+#breadcrump
+  font-size: 0.5em
+  a
+    :color = !main_red
+#sidebar
+  float: right
+  width: 20%
+  #page-versions
+    margin-top: -4em
+    text-align: right
+  #subpages
+    margin-top: 2em
+
+
+#wiki_content
+  h1, h2, h3, h4, h5
+    color: black
+  span.editsection
+    display: none
+
+#wiki-syntax-help
+  float: right
+  table
+    border-color: #78b74e
+>>>>>>> wiki:public/stylesheets/sass/main.sass