gollum 2.4.4 → 2.4.5

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

@@ -1,140 +1,135 @@
-
-.ace-kr-theme .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-kr-theme .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-kr-theme .ace_gutter {
   background: #1c1917;
-  color: #FCFFE0;
+  color: #FCFFE0
 }
 
-.ace-kr-theme .ace_print_margin {
+.ace-kr-theme .ace_print-margin {
   width: 1px;
-  background: #1c1917;
+  background: #1c1917
 }
 
 .ace-kr-theme .ace_scroller {
-  background-color: #0B0A09;
+  background-color: #0B0A09
 }
 
 .ace-kr-theme .ace_text-layer {
-  color: #FCFFE0;
+  color: #FCFFE0
 }
 
 .ace-kr-theme .ace_cursor {
-  border-left: 2px solid #FF9900;
+  border-left: 2px solid #FF9900
 }
 
-.ace-kr-theme .ace_cursor.ace_overwrite {
+.ace-kr-theme .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
-  border-bottom: 1px solid #FF9900;
+  border-bottom: 1px solid #FF9900
 }
 
 .ace-kr-theme .ace_marker-layer .ace_selection {
-  background: rgba(170, 0, 255, 0.45);
+  background: rgba(170, 0, 255, 0.45)
 }
 
-.ace-kr-theme.multiselect .ace_selection.start {
+.ace-kr-theme.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px #0B0A09;
-  border-radius: 2px;
+  border-radius: 2px
 }
 
 .ace-kr-theme .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(102, 82, 0)
 }
 
 .ace-kr-theme .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid rgba(255, 177, 111, 0.32);
+  border: 1px solid rgba(255, 177, 111, 0.32)
 }
 
-.ace-kr-theme .ace_marker-layer .ace_active_line {
-  background: #38403D;
+.ace-kr-theme .ace_marker-layer .ace_active-line {
+  background: #38403D
 }
 
-.ace-kr-theme .ace_gutter_active_line {
-  background-color : #38403D;
+.ace-kr-theme .ace_gutter-active-line {
+  background-color : #38403D
 }
 
-.ace-kr-theme .ace_marker-layer .ace_selected_word {
-  border: 1px solid rgba(170, 0, 255, 0.45);
+.ace-kr-theme .ace_marker-layer .ace_selected-word {
+  border: 1px solid rgba(170, 0, 255, 0.45)
 }
 
 .ace-kr-theme .ace_invisible {
-  color: rgba(255, 177, 111, 0.32);
-}
-
-.ace-kr-theme .ace_keyword, .ace-kr-theme .ace_meta {
-  color:#949C8B;
-}
-
-.ace-kr-theme .ace_constant, .ace-kr-theme .ace_constant.ace_other {
-  color:rgba(210, 117, 24, 0.76);
+  color: rgba(255, 177, 111, 0.32)
 }
 
-.ace-kr-theme .ace_constant.ace_character,  {
-  color:rgba(210, 117, 24, 0.76);
+.ace-kr-theme .ace_keyword,
+.ace-kr-theme .ace_meta {
+  color: #949C8B
 }
 
-.ace-kr-theme .ace_constant.ace_character.ace_escape,  {
-  color:rgba(210, 117, 24, 0.76);
+.ace-kr-theme .ace_constant,
+.ace-kr-theme .ace_constant.ace_character,
+.ace-kr-theme .ace_constant.ace_character.ace_escape,
+.ace-kr-theme .ace_constant.ace_other {
+  color: rgba(210, 117, 24, 0.76)
 }
 
 .ace-kr-theme .ace_invalid {
-  color:#F8F8F8;
-background-color:#A41300;
+  color: #F8F8F8;
+  background-color: #A41300
 }
 
 .ace-kr-theme .ace_support {
-  color:#9FC28A;
+  color: #9FC28A
 }
 
 .ace-kr-theme .ace_support.ace_constant {
-  color:#C27E66;
+  color: #C27E66
 }
 
 .ace-kr-theme .ace_fold {
-    background-color: #949C8B;
-    border-color: #FCFFE0;
+  background-color: #949C8B;
+  border-color: #FCFFE0
 }
 
 .ace-kr-theme .ace_support.ace_function {
-  color:#85873A;
+  color: #85873A
 }
 
 .ace-kr-theme .ace_storage {
-  color:#FFEE80;
+  color: #FFEE80
+}
+
+.ace-kr-theme .ace_string {
+  color: rgba(164, 161, 181, 0.8)
 }
 
 .ace-kr-theme .ace_string.ace_regexp {
-  color:rgba(125, 255, 192, 0.65);
+  color: rgba(125, 255, 192, 0.65)
 }
 
 .ace-kr-theme .ace_comment {
-  font-style:italic;
-color:#706D5B;
+  font-style: italic;
+  color: #706D5B
 }
 
 .ace-kr-theme .ace_variable {
-  color:#D1A796;
+  color: #D1A796
 }
 
 .ace-kr-theme .ace_variable.ace_language {
-  color:#FF80E1;
+  color: #FF80E1
 }
 
 .ace-kr-theme .ace_meta.ace_tag {
-  color:#BABD9C;
+  color: #BABD9C
 }
 
 .ace-kr-theme .ace_markup.ace_underline {
-    text-decoration:underline;
+  text-decoration: underline
 }
 
 .ace-kr-theme .ace_markup.ace_list {
-  background-color:#0F0040;
+  background-color: #0F0040
+}
+
+.ace-kr-theme .ace_indent-guide {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPg5uL8zzBz5sz/AA1WA+hUYIqjAAAAAElFTkSuQmCC) right repeat-y
 }

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

@@ -1,140 +1,122 @@
-
-.ace-merbivore .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-merbivore .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-merbivore .ace_gutter {
   background: #202020;
-  color: #E6E1DC;
+  color: #E6E1DC
 }
 
-.ace-merbivore .ace_print_margin {
+.ace-merbivore .ace_print-margin {
   width: 1px;
-  background: #e8e8e8;
+  background: #555651
 }
 
 .ace-merbivore .ace_scroller {
-  background-color: #161616;
+  background-color: #161616
 }
 
 .ace-merbivore .ace_text-layer {
-  color: #E6E1DC;
+  color: #E6E1DC
 }
 
 .ace-merbivore .ace_cursor {
-  border-left: 2px solid #FFFFFF;
+  border-left: 2px solid #FFFFFF
 }
 
-.ace-merbivore .ace_cursor.ace_overwrite {
+.ace-merbivore .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
-  border-bottom: 1px solid #FFFFFF;
+  border-bottom: 1px solid #FFFFFF
 }
 
 .ace-merbivore .ace_marker-layer .ace_selection {
-  background: #454545;
+  background: #454545
 }
 
-.ace-merbivore.multiselect .ace_selection.start {
+.ace-merbivore.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px #161616;
-  border-radius: 2px;
+  border-radius: 2px
 }
 
 .ace-merbivore .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(102, 82, 0)
 }
 
 .ace-merbivore .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid #404040;
+  border: 1px solid #404040
 }
 
-.ace-merbivore .ace_marker-layer .ace_active_line {
-  background: #333435;
+.ace-merbivore .ace_marker-layer .ace_active-line {
+  background: #333435
 }
 
-.ace-merbivore .ace_gutter_active_line {
-  background-color : #333435;
+.ace-merbivore .ace_gutter-active-line {
+  background-color: #333435
 }
 
-.ace-merbivore .ace_marker-layer .ace_selected_word {
-  border: 1px solid #454545;
+.ace-merbivore .ace_marker-layer .ace_selected-word {
+  border: 1px solid #454545
 }
 
 .ace-merbivore .ace_invisible {
-  color: #404040;
-}
-
-.ace-merbivore .ace_keyword, .ace-merbivore .ace_meta {
-  color:#FC6F09;
+  color: #404040
 }
 
-.ace-merbivore .ace_constant, .ace-merbivore .ace_constant.ace_other {
-  color:#1EDAFB;
+.ace-merbivore .ace_entity.ace_name.ace_tag,
+.ace-merbivore .ace_keyword,
+.ace-merbivore .ace_meta,
+.ace-merbivore .ace_meta.ace_tag,
+.ace-merbivore .ace_storage,
+.ace-merbivore .ace_support.ace_function {
+  color: #FC6F09
 }
 
-.ace-merbivore .ace_constant.ace_character,  {
-  color:#1EDAFB;
+.ace-merbivore .ace_constant,
+.ace-merbivore .ace_constant.ace_character,
+.ace-merbivore .ace_constant.ace_character.ace_escape,
+.ace-merbivore .ace_constant.ace_other,
+.ace-merbivore .ace_support.ace_type {
+  color: #1EDAFB
 }
 
-.ace-merbivore .ace_constant.ace_character.ace_escape,  {
-  color:#1EDAFB;
+.ace-merbivore .ace_constant.ace_character.ace_escape {
+  color: #519F50
 }
 
 .ace-merbivore .ace_constant.ace_language {
-  color:#FDC251;
+  color: #FDC251
 }
 
-.ace-merbivore .ace_constant.ace_library {
-  color:#8DFF0A;
+.ace-merbivore .ace_constant.ace_library,
+.ace-merbivore .ace_string,
+.ace-merbivore .ace_support.ace_constant {
+  color: #8DFF0A
 }
 
 .ace-merbivore .ace_constant.ace_numeric {
-  color:#58C554;
+  color: #58C554
 }
 
 .ace-merbivore .ace_invalid {
-  color:#FFFFFF;
-background-color:#990000;
-}
-
-.ace-merbivore .ace_support.ace_constant {
-  color:#8DFF0A;
+  color: #FFFFFF;
+  background-color: #990000
 }
 
 .ace-merbivore .ace_fold {
-    background-color: #FC6F09;
-    border-color: #E6E1DC;
-}
-
-.ace-merbivore .ace_support.ace_function {
-  color:#FC6F09;
-}
-
-.ace-merbivore .ace_storage {
-  color:#FC6F09;
-}
-
-.ace-merbivore .ace_string {
-  color:#8DFF0A;
+  background-color: #FC6F09;
+  border-color: #E6E1DC
 }
 
 .ace-merbivore .ace_comment {
-  font-style:italic;
-color:#AD2EA4;
-}
-
-.ace-merbivore .ace_meta.ace_tag {
-  color:#FC6F09;
+  font-style: italic;
+  color: #AD2EA4
 }
 
 .ace-merbivore .ace_entity.ace_other.ace_attribute-name {
-  color:#FFFF89;
+  color: #FFFF89
 }
 
 .ace-merbivore .ace_markup.ace_underline {
-    text-decoration:underline;
+  text-decoration: underline
+}
+
+.ace-merbivore .ace_indent-guide {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQExP7zzBz5sz/AA50BAyDznYhAAAAAElFTkSuQmCC) right repeat-y
 }