gollum 2.4.4 → 2.4.5

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/theme/crimson_editor.js

@@ -1,43 +1,36 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
 exports.isDark = false;
-exports.cssText = require('ace/requirejs/text!./crimson_editor.css');
+exports.cssText = require("../requirejs/text!./crimson_editor.css");
 
 exports.cssClass = "ace-crimson-editor";
 

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/theme/dawn.css

@@ -1,149 +1,137 @@
-
-.ace-dawn .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-dawn .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-dawn .ace_gutter {
   background: #ebebeb;
-  color: #333;
+  color: #333
 }
 
-.ace-dawn .ace_print_margin {
+.ace-dawn .ace_print-margin {
   width: 1px;
-  background: #e8e8e8;
+  background: #e8e8e8
 }
 
 .ace-dawn .ace_scroller {
-  background-color: #F9F9F9;
+  background-color: #F9F9F9
 }
 
 .ace-dawn .ace_text-layer {
-  color: #080808;
+  color: #080808
 }
 
 .ace-dawn .ace_cursor {
-  border-left: 2px solid #000000;
+  border-left: 2px solid #000000
 }
 
-.ace-dawn .ace_cursor.ace_overwrite {
+.ace-dawn .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
-  border-bottom: 1px solid #000000;
+  border-bottom: 1px solid #000000
 }
 
 .ace-dawn .ace_marker-layer .ace_selection {
-  background: rgba(39, 95, 255, 0.30);
+  background: rgba(39, 95, 255, 0.30)
 }
 
-.ace-dawn.multiselect .ace_selection.start {
+.ace-dawn.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px #F9F9F9;
-  border-radius: 2px;
+  border-radius: 2px
 }
 
 .ace-dawn .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(255, 255, 0)
 }
 
 .ace-dawn .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid rgba(75, 75, 126, 0.50);
+  border: 1px solid rgba(75, 75, 126, 0.50)
 }
 
-.ace-dawn .ace_marker-layer .ace_active_line {
-  background: rgba(36, 99, 180, 0.12);
+.ace-dawn .ace_marker-layer .ace_active-line {
+  background: rgba(36, 99, 180, 0.12)
 }
 
-.ace-dawn .ace_gutter_active_line {
-  background-color : #dcdcdc;
+.ace-dawn .ace_gutter-active-line {
+  background-color : #dcdcdc
 }
 
-.ace-dawn .ace_marker-layer .ace_selected_word {
-  border: 1px solid rgba(39, 95, 255, 0.30);
+.ace-dawn .ace_marker-layer .ace_selected-word {
+  border: 1px solid rgba(39, 95, 255, 0.30)
 }
 
 .ace-dawn .ace_invisible {
-  color: rgba(75, 75, 126, 0.50);
-}
-
-.ace-dawn .ace_keyword, .ace-dawn .ace_meta {
-  color:#794938;
-}
-
-.ace-dawn .ace_constant, .ace-dawn .ace_constant.ace_other {
-  color:#811F24;
+  color: rgba(75, 75, 126, 0.50)
 }
 
-.ace-dawn .ace_constant.ace_character,  {
-  color:#811F24;
+.ace-dawn .ace_keyword,
+.ace-dawn .ace_meta {
+  color: #794938
 }
 
-.ace-dawn .ace_constant.ace_character.ace_escape,  {
-  color:#811F24;
+.ace-dawn .ace_constant,
+.ace-dawn .ace_constant.ace_character,
+.ace-dawn .ace_constant.ace_character.ace_escape,
+.ace-dawn .ace_constant.ace_other {
+  color: #811F24
 }
 
 .ace-dawn .ace_invalid.ace_illegal {
-  text-decoration:underline;
-font-style:italic;
-color:#F8F8F8;
-background-color:#B52A1D;
+  text-decoration: underline;
+  font-style: italic;
+  color: #F8F8F8;
+  background-color: #B52A1D
 }
 
 .ace-dawn .ace_invalid.ace_deprecated {
-  text-decoration:underline;
-font-style:italic;
-color:#B52A1D;
+  text-decoration: underline;
+  font-style: italic;
+  color: #B52A1D
 }
 
 .ace-dawn .ace_support {
-  color:#691C97;
+  color: #691C97
 }
 
 .ace-dawn .ace_support.ace_constant {
-  color:#B4371F;
+  color: #B4371F
 }
 
 .ace-dawn .ace_fold {
-    background-color: #794938;
-    border-color: #080808;
+  background-color: #794938;
+  border-color: #080808
 }
 
+.ace-dawn .ace_markup.ace_list,
 .ace-dawn .ace_support.ace_function {
-  color:#693A17;
+  color: #693A17
 }
 
 .ace-dawn .ace_storage {
-  font-style:italic;
-color:#A71D5D;
+  font-style: italic;
+  color: #A71D5D
 }
 
 .ace-dawn .ace_string {
-  color:#0B6125;
+  color: #0B6125
 }
 
 .ace-dawn .ace_string.ace_regexp {
-  color:#CF5628;
+  color: #CF5628
 }
 
 .ace-dawn .ace_comment {
-  font-style:italic;
-color:#5A525F;
+  font-style: italic;
+  color: #5A525F
 }
 
 .ace-dawn .ace_variable {
-  color:#234A97;
+  color: #234A97
 }
 
 .ace-dawn .ace_markup.ace_underline {
-    text-decoration:underline;
+  text-decoration: underline
 }
 
 .ace-dawn .ace_markup.ace_heading {
-  color:#19356D;
+  color: #19356D
 }
 
-.ace-dawn .ace_markup.ace_list {
-  color:#693A17;
+.ace-dawn .ace_indent-guide {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4+fPnf4ZVq1b9BwAkVQboFQv98gAAAABJRU5ErkJggg==) right repeat-y
 }

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/theme/dawn.js

@@ -1,37 +1,30 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
@@ -39,8 +32,8 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-dawn";
-exports.cssText = require('ace/requirejs/text!./dawn.css');
+exports.cssText = require("../requirejs/text!./dawn.css");
 
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
 });

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/theme/dreamweaver.css

@@ -1,23 +1,19 @@
-.ace-dreamweaver .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-dreamweaver .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-dreamweaver .ace_gutter {
   background: #e8e8e8;
   color: #333;
 }
 
-.ace-dreamweaver .ace_print_margin {
+.ace-dreamweaver .ace_print-margin {
   width: 1px;
   background: #e8e8e8;
 }
 
+.ace-dreamweaver .ace_scroller {
+  background-color: #FFFFFF;
+}
+
 .ace-dreamweaver .ace_fold {
-    background-color: #00F;
+    background-color: #757AD8;
 }
 
 .ace-dreamweaver .ace_text-layer {
@@ -27,83 +23,83 @@
   border-left: 2px solid black;
 }
 
-.ace-dreamweaver .ace_cursor.ace_overwrite {
+.ace-dreamweaver .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
         
-.ace-dreamweaver .ace_line .ace_invisible {
+.ace-dreamweaver .ace_invisible {
   color: rgb(191, 191, 191);
 }
 
-.ace-dreamweaver .ace_line .ace_storage,
-.ace-dreamweaver .ace_line .ace_keyword {
+.ace-dreamweaver .ace_storage,
+.ace-dreamweaver .ace_keyword {
   color: blue;
 }
 
-.ace-dreamweaver .ace_line .ace_constant.ace_buildin {
+.ace-dreamweaver .ace_constant.ace_buildin {
   color: rgb(88, 72, 246);
 }
 
-.ace-dreamweaver .ace_line .ace_constant.ace_language {
+.ace-dreamweaver .ace_constant.ace_language {
   color: rgb(88, 92, 246);
 }
 
-.ace-dreamweaver .ace_line .ace_constant.ace_library {
+.ace-dreamweaver .ace_constant.ace_library {
   color: rgb(6, 150, 14);
 }
 
-.ace-dreamweaver .ace_line .ace_invalid {
+.ace-dreamweaver .ace_invalid {
   background-color: rgb(153, 0, 0);
   color: white;
 }
 
-.ace-dreamweaver .ace_line .ace_support.ace_function {
+.ace-dreamweaver .ace_support.ace_function {
   color: rgb(60, 76, 114);
 }
 
-.ace-dreamweaver .ace_line .ace_support.ace_constant {
+.ace-dreamweaver .ace_support.ace_constant {
   color: rgb(6, 150, 14);
 }
 
-.ace-dreamweaver .ace_line .ace_support.ace_type,
-.ace-dreamweaver .ace_line .ace_support.ace_class {
+.ace-dreamweaver .ace_support.ace_type,
+.ace-dreamweaver .ace_support.ace_class {
   color: #009;
 }
 
-.ace-dreamweaver .ace_line .ace_support.ace_php_tag {
+.ace-dreamweaver .ace_support.ace_php_tag {
   color: #f00;
 }
 
-.ace-dreamweaver .ace_line .ace_keyword.ace_operator {
+.ace-dreamweaver .ace_keyword.ace_operator {
   color: rgb(104, 118, 135);
 }
 
-.ace-dreamweaver .ace_line .ace_string {
+.ace-dreamweaver .ace_string {
   color: #00F;
 }
 
-.ace-dreamweaver .ace_line .ace_comment {
+.ace-dreamweaver .ace_comment {
   color: rgb(76, 136, 107);
 }
 
-.ace-dreamweaver .ace_line .ace_comment.ace_doc {
+.ace-dreamweaver .ace_comment.ace_doc {
   color: rgb(0, 102, 255);
 }
 
-.ace-dreamweaver .ace_line .ace_comment.ace_doc.ace_tag {
+.ace-dreamweaver .ace_comment.ace_doc.ace_tag {
   color: rgb(128, 159, 191);
 }
 
-.ace-dreamweaver .ace_line .ace_constant.ace_numeric {
+.ace-dreamweaver .ace_constant.ace_numeric {
   color: rgb(0, 0, 205);
 }
 
-.ace-dreamweaver .ace_line .ace_variable {
+.ace-dreamweaver .ace_variable {
   color: #06F
 }
 
-.ace-dreamweaver .ace_line .ace_xml_pe {
+.ace-dreamweaver .ace_xml-pe {
   color: rgb(104, 104, 91);
 }
 
@@ -111,9 +107,6 @@
   color: #00F;
 }
 
-.ace-dreamweaver .ace_markup.ace_markupine {
-    text-decoration:underline;
-}
 
 .ace-dreamweaver .ace_markup.ace_heading {
   color: rgb(12, 7, 255);
@@ -140,11 +133,11 @@
   border: 1px solid rgb(192, 192, 192);
 }
 
-.ace-dreamweaver .ace_marker-layer .ace_active_line {
+.ace-dreamweaver .ace_marker-layer .ace_active-line {
   background: rgba(0, 0, 0, 0.07);
 }
 
-.ace-dreamweaver .ace_marker-layer .ace_selected_word {
+.ace-dreamweaver .ace_marker-layer .ace_selected-word {
   background: rgb(250, 250, 255);
   border: 1px solid rgb(200, 200, 250);
 }
@@ -179,4 +172,8 @@
 
 .ace-dreamweaver .ace_string.ace_regex {
   color: rgb(255, 0, 0)
+}
+
+.ace-dreamweaver .ace_indent-guide {
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;
 }