gollum 2.4.4 → 2.4.5

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/theme/clouds_midnight.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 = true;
 exports.cssClass = "ace-clouds-midnight";
-exports.cssText = require('ace/requirejs/text!./clouds_midnight.css');
+exports.cssText = require("../requirejs/text!./clouds_midnight.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/cobalt.css

@@ -1,145 +1,144 @@
-
-.ace-cobalt .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-cobalt .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-cobalt .ace_gutter {
   background: #011e3a;
-  color: #fff;
+  color: #fff
 }
 
-.ace-cobalt .ace_print_margin {
+.ace-cobalt .ace_print-margin {
   width: 1px;
-  background: #011e3a;
+  background: #011e3a
 }
 
 .ace-cobalt .ace_scroller {
-  background-color: #002240;
+  background-color: #002240
 }
 
 .ace-cobalt .ace_text-layer {
-  color: #FFFFFF;
+  color: #FFFFFF
 }
 
 .ace-cobalt .ace_cursor {
-  border-left: 2px solid #FFFFFF;
+  border-left: 2px solid #FFFFFF
 }
 
-.ace-cobalt .ace_cursor.ace_overwrite {
+.ace-cobalt .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
-  border-bottom: 1px solid #FFFFFF;
+  border-bottom: 1px solid #FFFFFF
 }
 
 .ace-cobalt .ace_marker-layer .ace_selection {
-  background: rgba(179, 101, 57, 0.75);
+  background: rgba(179, 101, 57, 0.75)
 }
 
-.ace-cobalt.multiselect .ace_selection.start {
+.ace-cobalt.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px #002240;
-  border-radius: 2px;
+  border-radius: 2px
 }
 
 .ace-cobalt .ace_marker-layer .ace_step {
-  background: rgb(127, 111, 19);
+  background: rgb(127, 111, 19)
 }
 
 .ace-cobalt .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid rgba(255, 255, 255, 0.15);
+  border: 1px solid rgba(255, 255, 255, 0.15)
 }
 
-.ace-cobalt .ace_marker-layer .ace_active_line {
-  background: rgba(0, 0, 0, 0.35);
+.ace-cobalt .ace_marker-layer .ace_active-line {
+  background: rgba(0, 0, 0, 0.35)
 }
 
-.ace-cobalt .ace_gutter_active_line {
-  background-color : rgba(0, 0, 0, 0.35);
+.ace-cobalt .ace_gutter-active-line {
+  background-color: rgba(0, 0, 0, 0.35)
 }
 
-.ace-cobalt .ace_marker-layer .ace_selected_word {
-  border: 1px solid rgba(179, 101, 57, 0.75);
+.ace-cobalt .ace_marker-layer .ace_selected-word {
+  border: 1px solid rgba(179, 101, 57, 0.75)
 }
 
 .ace-cobalt .ace_invisible {
-  color: rgba(255, 255, 255, 0.15);
-}
-
-.ace-cobalt .ace_keyword, .ace-cobalt .ace_meta {
-  color:#FF9D00;
+  color: rgba(255, 255, 255, 0.15)
 }
 
-.ace-cobalt .ace_constant, .ace-cobalt .ace_constant.ace_other {
-  color:#FF628C;
+.ace-cobalt .ace_keyword,
+.ace-cobalt .ace_meta {
+  color: #FF9D00
 }
 
-.ace-cobalt .ace_constant.ace_character,  {
-  color:#FF628C;
-}
-
-.ace-cobalt .ace_constant.ace_character.ace_escape,  {
-  color:#FF628C;
+.ace-cobalt .ace_constant,
+.ace-cobalt .ace_constant.ace_character,
+.ace-cobalt .ace_constant.ace_character.ace_escape,
+.ace-cobalt .ace_constant.ace_other {
+  color: #FF628C
 }
 
 .ace-cobalt .ace_invalid {
-  color:#F8F8F8;
-background-color:#800F00;
+  color: #F8F8F8;
+  background-color: #800F00
 }
 
 .ace-cobalt .ace_support {
-  color:#80FFBB;
+  color: #80FFBB
 }
 
 .ace-cobalt .ace_support.ace_constant {
-  color:#EB939A;
+  color: #EB939A
 }
 
 .ace-cobalt .ace_fold {
-    background-color: #FF9D00;
-    border-color: #FFFFFF;
+  background-color: #FF9D00;
+  border-color: #FFFFFF
 }
 
 .ace-cobalt .ace_support.ace_function {
-  color:#FFB054;
+  color: #FFB054
 }
 
 .ace-cobalt .ace_storage {
-  color:#FFEE80;
+  color: #FFEE80
+}
+
+.ace-cobalt .ace_entity {
+  color: #FFDD00
+}
+
+.ace-cobalt .ace_string {
+  color: #3AD900
 }
 
 .ace-cobalt .ace_string.ace_regexp {
-  color:#80FFC2;
+  color: #80FFC2
 }
 
 .ace-cobalt .ace_comment {
-  font-style:italic;
-color:#0088FF;
+  font-style: italic;
+  color: #0088FF
 }
 
 .ace-cobalt .ace_variable {
-  color:#CCCCCC;
+  color: #CCCCCC
 }
 
 .ace-cobalt .ace_variable.ace_language {
-  color:#FF80E1;
+  color: #FF80E1
 }
 
 .ace-cobalt .ace_meta.ace_tag {
-  color:#9EFFFF;
+  color: #9EFFFF
 }
 
 .ace-cobalt .ace_markup.ace_underline {
-    text-decoration:underline;
+  text-decoration: underline
 }
 
 .ace-cobalt .ace_markup.ace_heading {
-  color:#C8E4FD;
-background-color:#001221;
+  color: #C8E4FD;
+  background-color: #001221
 }
 
 .ace-cobalt .ace_markup.ace_list {
-  background-color:#130D26;
+  background-color: #130D26
+}
+
+.ace-cobalt .ace_indent-guide {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgUHL4zzBz5sz/AA80BCzv+WXhAAAAAElFTkSuQmCC) right repeat-y
 }

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/theme/cobalt.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 = true;
 exports.cssClass = "ace-cobalt";
-exports.cssText = require('ace/requirejs/text!./cobalt.css');
+exports.cssText = require("../requirejs/text!./cobalt.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/crimson_editor.css

@@ -1,11 +1,3 @@
-.ace-crimson-editor .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-crimson-editor .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-crimson-editor .ace_gutter {
   background: #ebebeb;
   color: #333;
@@ -17,11 +9,15 @@
   text-align: right;
 }
 
-.ace-crimson-editor .ace_print_margin {
+.ace-crimson-editor .ace_print-margin {
   width: 1px;
   background: #e8e8e8;
 }
 
+.ace-crimson-editor .ace_scroller {
+  background-color: #FFFFFF;
+}
+
 .ace-crimson-editor .ace_text-layer {
   color: rgb(64, 64, 64);
 }
@@ -30,85 +26,85 @@
   border-left: 2px solid black;
 }
 
-.ace-crimson-editor .ace_cursor.ace_overwrite {
+.ace-crimson-editor .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
 
-.ace-crimson-editor .ace_line .ace_invisible {
+.ace-crimson-editor .ace_invisible {
   color: rgb(191, 191, 191);
 }
 
-.ace-crimson-editor .ace_line .ace_identifier {
+.ace-crimson-editor .ace_identifier {
   color: black;
 }
 
-.ace-crimson-editor .ace_line .ace_keyword {
+.ace-crimson-editor .ace_keyword {
   color: blue;
 }
 
-.ace-crimson-editor .ace_line .ace_constant.ace_buildin {
+.ace-crimson-editor .ace_constant.ace_buildin {
   color: rgb(88, 72, 246);
 }
 
-.ace-crimson-editor .ace_line .ace_constant.ace_language {
+.ace-crimson-editor .ace_constant.ace_language {
   color: rgb(255, 156, 0);
 }
 
-.ace-crimson-editor .ace_line .ace_constant.ace_library {
+.ace-crimson-editor .ace_constant.ace_library {
   color: rgb(6, 150, 14);
 }
 
-.ace-crimson-editor .ace_line .ace_invalid {
+.ace-crimson-editor .ace_invalid {
   text-decoration: line-through;
   color: rgb(224, 0, 0);
 }
 
-.ace-crimson-editor .ace_line .ace_fold {
+.ace-crimson-editor .ace_fold {
 }
 
-.ace-crimson-editor .ace_line .ace_support.ace_function {
+.ace-crimson-editor .ace_support.ace_function {
   color: rgb(192, 0, 0);
 }
 
-.ace-crimson-editor .ace_line .ace_support.ace_constant {
+.ace-crimson-editor .ace_support.ace_constant {
   color: rgb(6, 150, 14);
 }
 
-.ace-crimson-editor .ace_line .ace_support.ace_type,
-.ace-crimson-editor .ace_line .ace_support.ace_class {
+.ace-crimson-editor .ace_support.ace_type,
+.ace-crimson-editor .ace_support.ace_class {
   color: rgb(109, 121, 222);
 }
 
-.ace-crimson-editor .ace_line .ace_keyword.ace_operator {
+.ace-crimson-editor .ace_keyword.ace_operator {
   color: rgb(49, 132, 149);
 }
 
-.ace-crimson-editor .ace_line .ace_string {
+.ace-crimson-editor .ace_string {
   color: rgb(128, 0, 128);
 }
 
-.ace-crimson-editor .ace_line .ace_comment {
+.ace-crimson-editor .ace_comment {
   color: rgb(76, 136, 107);
 }
 
-.ace-crimson-editor .ace_line .ace_comment.ace_doc {
+.ace-crimson-editor .ace_comment.ace_doc {
   color: rgb(0, 102, 255);
 }
 
-.ace-crimson-editor .ace_line .ace_comment.ace_doc.ace_tag {
+.ace-crimson-editor .ace_comment.ace_doc.ace_tag {
   color: rgb(128, 159, 191);
 }
 
-.ace-crimson-editor .ace_line .ace_constant.ace_numeric {
+.ace-crimson-editor .ace_constant.ace_numeric {
   color: rgb(0, 0, 64);
 }
 
-.ace-crimson-editor .ace_line .ace_variable {
+.ace-crimson-editor .ace_variable {
   color: rgb(0, 64, 128);
 }
 
-.ace-crimson-editor .ace_line .ace_xml_pe {
+.ace-crimson-editor .ace_xml-pe {
   color: rgb(104, 104, 91);
 }
 
@@ -129,11 +125,11 @@
   border: 1px solid rgb(192, 192, 192);
 }
 
-.ace-crimson-editor .ace_marker-layer .ace_active_line {
+.ace-crimson-editor .ace_marker-layer .ace_active-line {
   background: rgb(232, 242, 254);
 }
 
-.ace-crimson-editor .ace_gutter_active_line {
+.ace-crimson-editor .ace_gutter-active-line {
     background-color : #dcdcdc;
 }
 
@@ -141,11 +137,15 @@
   color:rgb(28, 2, 255);
 }
 
-.ace-crimson-editor .ace_marker-layer .ace_selected_word {
+.ace-crimson-editor .ace_marker-layer .ace_selected-word {
   background: rgb(250, 250, 255);
   border: 1px solid rgb(200, 200, 250);
 }
 
 .ace-crimson-editor .ace_string.ace_regex {
   color: rgb(192, 0, 192);
+}
+
+.ace-crimson-editor .ace_indent-guide {
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;
 }