gollum 3.0.0 → 3.1.0

data/lib/gollum/public/gollum/css/gollum.css

@@ -21,9 +21,15 @@ body, html {
 #wiki-wrapper {
   margin: 0 auto;
   overflow: visible;
-  width: 920px;
-  padding-left:20px;
-  padding-right:20px;
+  width: 100%;
+}
+
+@media all and (min-width: 940px) {
+  #wiki-wrapper {
+    max-width: 920px;
+    padding-left:20px;
+    padding-right:20px;
+  }
 }
 
 a:link {
@@ -39,22 +45,41 @@ a:hover, a:visited {
 
 /* @section head */
 #head {
-  border-bottom: 1px solid #ddd;
-  margin: 4em 0 1.5em;
-  padding-bottom: 0.3em;
+  margin: 1em 0 0;
+  padding: 0;
   overflow: hidden;
 }
 
 #head h1 {
-  font-size: 2.5em;
+  font-size: 1.5em;
   float: left;
   line-height: normal;
   margin: 0;
-  padding: 2px 0 0 0;
+  padding: 0 0 0 0.667em;
 }
 
 #head ul.actions {
-  float: right;
+  clear: both;
+  margin: 0 1em;
+}
+
+@media all and (min-width: 940px) {
+  #head {
+    border-bottom: 1px solid #ddd;
+    padding-bottom: 0.3em;
+    margin: 4em 0 1.5em;
+  }
+
+  #head h1 {
+    font-size: 2.5em;
+    padding: 2px 0 0 0;
+  }
+
+  #head ul.actions {
+    clear: none;
+    float: right;
+    margin: 0;
+  }
 }
 
 /* @section content */
@@ -89,6 +114,12 @@ a:hover, a:visited {
   width: 100%;
 }
 
+#wiki-body table {
+  display: block;
+  overflow: auto;
+  border: 0;
+}
+
 .has-sidebar #wiki-body {
   width: 68%;
 }
@@ -244,6 +275,16 @@ a:hover, a:visited {
   font-weight: bold;
 }
 
+#footer .actions {
+  margin-left: 1em;
+}
+
+@media all and (min-width: 940px) {
+  #footer .actions {
+    margin: 0;
+  }
+}
+
 
 /* @section history */
 .history h1 {
@@ -257,7 +298,7 @@ a:hover, a:visited {
 }
 
 #wiki-history {
-  margin-top: 2em;
+  margin: 2em 1em 0 1em;
 }
 
 #wiki-history fieldset {
@@ -283,7 +324,8 @@ a:hover, a:visited {
 }
 
 #wiki-history table tr td {
-  border: 1px solid #c0dce9;
+  border-top: 1px solid #c0dce9;
+  border-bottom: 1px solid #c0dce9;
   font-size: 1em;
   line-height: 1.6em;
   margin: 0;
@@ -291,8 +333,8 @@ a:hover, a:visited {
 }
 
 #wiki-history table tr td.checkbox {
-  width: 4em;
-  padding: 0.3em;
+  width: auto;
+  padding: 0 0.2em 0 0;
 }
 
 #wiki-history table tr td.checkbox input {
@@ -364,6 +406,25 @@ a:hover, a:visited {
   margin: 0 0.6em 0 0;
 }
 
+@media all and (min-width: 940px) {
+  #wiki-history {
+    margin: 2em 0 0 0;
+  }
+
+  #wiki-history table tr td {
+    border: 1px solid #c0dce9;
+    font-size: 1em;
+    line-height: 1.6em;
+    margin: 0;
+    padding: 0.3em 0.7em;
+  }
+
+  #wiki-history table tr td.checkbox {
+    width: 4em;
+    padding: 0.3em;
+  }
+}
+
 
 /* @section edit */
 .edit h1 {
@@ -378,6 +439,7 @@ a:hover, a:visited {
 
 
 /* @section search */
+
 .results h1 {
   color: #999;
   font-weight: normal;
@@ -390,6 +452,8 @@ a:hover, a:visited {
 
 .results #results {
   border-bottom: 1px solid #ccc;
+  margin-left: 1em;
+  margin-right: 1em;
   margin-bottom: 2em;
   padding-bottom: 2em;
 }
@@ -400,12 +464,33 @@ a:hover, a:visited {
 }
 
 .results #results ul li {
-  font-size: 1.2em;
-  line-height: 1.6em;
-  list-style-position: outside;
+  list-style: none;
   padding: 0.2em 0;
 }
 
+.results #results ul li a {
+  word-wrap: break-word;
+}
+
+@media all and (min-width: 640px) {
+  .results #results ul li {
+    font-size: 1.2em;
+  }
+}
+
+@media all and (min-width: 940px) {
+  .results #results {
+    margin-left: 0;
+    margin-right: 0;
+  }
+
+  .results #results ul li {
+    list-style: disc;
+    list-style-position: outside;
+    line-height: 1.6em;
+  }
+}
+
 .results #results ul li span.count {
   color: #999;
 }
@@ -522,8 +607,8 @@ ul.actions {
  ul.actions li {
    float: left;
    font-size: 0.9em;
-   margin-left: 0.6em;
-   margin-bottom: 0.6em;
+   margin-left: 1px;
+   margin-bottom: 1px;
  }
 
 .minibutton a {
@@ -533,7 +618,7 @@ ul.actions {
   display: block;
   font-weight: bold;
   margin: 0;
-  padding: 0.4em 1em;
+  padding: 0.6em 1em;
   height: 1.4em;
 
   text-shadow: 0 1px 0 #fff;
@@ -547,6 +632,18 @@ ul.actions {
   -webkit-border-radius: 3px;
 }
 
+@media all and (min-width: 940px) {
+  ul.actions li {
+    margin-left: 0.6em;
+    margin-bottom: 0.6em;
+  }
+
+  .minibutton a {
+    padding: 0.4em 1em;
+    height: 1.4em;
+  }
+}
+
 #search-submit {
   background-color: #f7f7f7;
   border: 1px solid #d4d4d4;
@@ -627,7 +724,7 @@ ul.actions {
 /* @control searchbar */
 #head #searchbar {
   float: right;
-  padding: 0;
+  padding: 2px 0 0 0;
   overflow: hidden;
 }
 
@@ -684,7 +781,7 @@ ul.actions {
   height: inherit;
   overflow: hidden;
   text-indent: -5000px;
-  width: 28px;
+  width: 32px;
 }
 
 .ff #head #searchbar #searchbar-fauxtext #search-submit span,
@@ -697,11 +794,31 @@ ul.actions {
   padding: 0;
 }
 
+@media all and (min-width: 940px) {
+  #head #searchbar {
+    padding: 0;
+  }
+
+  #head #searchbar #searchbar-fauxtext #search-submit span {
+    width: 28px;
+  }
+
+  #head #searchbar #searchbar-fauxtext #search-submit:hover span {
+    background-position: -431px -28px;
+  }
+}
+
 /* @section pages */
 
 #pages {
   font-size: 1.2em;
-  margin-bottom: 20px;
+  margin: 0 1em 20px 1em;
+}
+
+@media all and (min-width: 940px) {
+  #pages {
+    margin: 0 0 20px 0;
+  }
 }
 
 #pages ul {

data/lib/gollum/public/gollum/css/ie7.css

@@ -1,5 +1,11 @@
 /* IE7-specific styles */
 
+.ie #wiki-wrapper {
+  width: 920px;
+  padding-left:20px;
+  padding-right:20px;
+}
+
 .ie #head #searchbar #searchbar-fauxtext input#search-query {
   border: 0;
   float: left;

data/lib/gollum/public/gollum/css/template.css

@@ -2,6 +2,10 @@
   Gollum v3 Template
 */
 
+/*!
+ *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
 @font-face {
   font-family: 'FontAwesome';
   src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
@@ -23,6 +27,51 @@
   content: "\f0c1";
 }
 
+.fa-spinner:before {
+  content: "\f110";
+}
+
+.fa-spin {
+  -webkit-animation: spin 2s infinite linear;
+  -moz-animation: spin 2s infinite linear;
+  -o-animation: spin 2s infinite linear;
+  animation: spin 2s infinite linear;
+}
+@-moz-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+  }
+}
+@-o-keyframes spin {
+  0% {
+    -o-transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+  }
+}
+@keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+
 /* margin & padding reset*/
 * {
   margin: 0;
@@ -48,7 +97,6 @@ body {
   font: 13.34px Helvetica, arial, freesans, clean, sans-serif;
   font-size: small;
   line-height: 1.4;
-  min-width: 980px;
 }
 
 img {
@@ -82,13 +130,19 @@ a:active, a:hover {
 }
 
 .markdown-body {
-  padding: 30px;
+  padding: 1em;
   font-size: 15px;
   line-height: 1.7;
   overflow: hidden;
   word-wrap: break-word;
 }
 
+@media all and (min-width: 940px) {
+  .markdown-body {
+    padding: 30px;
+  }
+}
+
 .markdown-body > *:first-child {
   margin-top: 0 !important;
 }

data/lib/gollum/public/gollum/javascript/editor/gollum.editor.js

@@ -98,6 +98,52 @@
           $('#gollum-editor-help').removeClass('jaws');
         }
       } // EditorHas.functionBar
+
+      if ( EditorHas.dragDropUpload() ) {
+        var $editorBody = $('#gollum-editor-body');
+        var editorBody = $('#gollum-editor-body')[0];
+        editorBody.ondragover = function(e) {
+          $editorBody.addClass('dragging');
+          return false;
+        };
+        editorBody.ondragleave = function() {
+          $editorBody.removeClass('dragging');
+          return false;
+        };
+        editorBody.ondrop = function(e) {
+          debug("dropped file");
+          e.preventDefault();
+          $editorBody.removeClass('dragging').addClass('uploading');
+
+          var file = e.dataTransfer.files[0],
+              formData = new FormData();
+          formData.append('upload_dest', uploadDest);
+          formData.append('file', file);
+
+          $.ajax({
+            url: '/uploadFile',
+            data: formData,
+            cache: false,
+            contentType: false,
+            processData: false,
+            type: 'POST',
+            success: function(){
+              $editorBody.removeClass('uploading');
+              var text = '[[' + uploadDest + '/' + file.name + ']]';
+              var pos = editorBody.selectionStart || 0;
+              editorBody.value = editorBody.value.substring(0, pos) + text + editorBody.value.substring(pos);
+              editorBody.selectionStart = pos + text.length;
+              editorBody.selectionEnd = pos + text.length;
+            },
+            error: function(r, textStatus) {
+              alert('Error uploading file: ' + textStatus);
+              $editorBody.removeClass('uploading');
+            }
+          });
+
+          return false;
+        };
+      } // EditorHas.dragDropUpload
     } // EditorHas.baseEditorMarkup
   };
 
@@ -444,6 +490,17 @@
      */
     titleDisplayed: function() {
       return ( ActiveOptions.NewFile );
+    },
+
+
+    /**
+     *  EditorHas.dragDropUpload
+     *  True if the editor is supports drag and drop file uploads, false otherwise.
+     *
+     *  @return boolean
+     */
+    dragDropUpload: function() {
+      return $('#gollum-editor.uploads-allowed').length;
     }
 
   };
@@ -546,9 +603,12 @@
              typeof definitionObject.replace == 'string' ) {
           debug('Running replacement - using ' + definitionObject.replace);
           var rt = definitionObject.replace;
+
+          repText = escape( repText );
           repText = repText.replace( searchExp, rt );
           // remove backreferences
           repText = repText.replace( /\$[\d]/g, '' );
+          repText = unescape( repText );
 
           if ( repText === '' ) {
             debug('Search string is empty');