Merge remote-tracking branch 'upstream/master' into frontend-tweak

.travis.yml

@@ -1,5 +1,6 @@
 rvm:
   - 1.8.7
+  - 1.9.3
 notifications:
   disabled: true
 before_install:

README.md

@@ -472,6 +472,9 @@ like Rack::Auth, OmniAuth, etc.
     Precious::App.set(:default_markup, :markdown) # set your favorite markup language
     run Precious::App
 
+## Windows Filename Validation
+Note that filenames on windows must not contain any of the following characters `\ / : * ? " < > |`. See [this support article](http://support.microsoft.com/kb/177506) for details.
+
 ## Testing
 
 [![Build Status](https://secure.travis-ci.org/github/gollum.png?branch=master)](http://travis-ci.org/github/gollum)

lib/gollum/frontend/public/gollum/css/gollum.css

@@ -10,6 +10,17 @@
   A basic stylesheet for Gollum
 */
 
+/*
+  Fixes AsciiDoc listing block rendering.
+  Must be !important to override
+  .markdown-body code, .markdown-body tt {
+  in template.css.
+  https://github.com/github/gollum/issues/278
+*/
+pre > tt {
+  white-space: pre !important;
+}
+
 /* @section core */
 body, html {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -127,18 +138,22 @@ a:hover, a:visited {
   width: 70%;
 }
 
+#wiki-header #header-content,
 #wiki-footer #footer-content {
   background-color: #f7f7f7;
   border: 1px solid #ddd;
-      font-size: 1.2em;
-      line-height: 1.5em;
-      margin-top: 1.5em;
   padding: 1em;
 
   border-radius: 0.5em;
   -moz-border-radius: 0.5em;
   -webkit-border-radius: 0.5em;
 }
+#wiki-header #header-content {
+  margin-bottom: 1.5em;
+}
+#wiki-footer #footer-content {
+  margin-top: 1.5em;
+}
 
 #wiki-footer #footer-content h3 {
   font-size: 1.2em;

lib/gollum/frontend/templates/page.mustache

@@ -22,7 +22,7 @@
   <div id="wiki-body" class="gollum-{{format}}-content">
     {{#has_header}}
     <div id="wiki-header" class="gollum-{{header_format}}-content">
-      <div id="header-content">
+      <div id="header-content" class="markdown-body">
         {{{header_content}}}
       </div>
     </div>
@@ -33,14 +33,14 @@
   </div>
   {{#has_sidebar}}
   <div id="wiki-rightbar" class="gollum-{{sidebar_format}}-content">
-    <div class="markdown-body">
+    <div id="sidebar-content" class="markdown-body">
       {{{sidebar_content}}}
     </div>
   </div>
   {{/has_sidebar}}
   {{#has_footer}}
   <div id="wiki-footer" class="gollum-{{footer_format}}-content">
-    <div id="footer-content">
+    <div id="footer-content" class="markdown-body">
       {{{footer_content}}}
     </div>
   </div>