gollum 2.4.4 → 2.4.5

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

@@ -1,46 +1,39 @@
 /* ***** 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.cssClass = "ace-chrome";
-exports.cssText = require('ace/requirejs/text!./chrome.css');
+exports.cssText = require("../requirejs/text!./chrome.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);
-
 });

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

@@ -1,118 +1,124 @@
-
-.ace-clouds .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-clouds .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-clouds .ace_gutter {
   background: #ebebeb;
-  color: #333;
+  color: #333
 }
 
-.ace-clouds .ace_print_margin {
+.ace-clouds .ace_print-margin {
   width: 1px;
-  background: #e8e8e8;
+  background: #e8e8e8
 }
 
 .ace-clouds .ace_scroller {
-  background-color: #FFFFFF;
+  background-color: #FFFFFF
 }
 
 .ace-clouds .ace_text-layer {
-  color: #000000;
+  color: #000000
 }
 
 .ace-clouds .ace_cursor {
-  border-left: 2px solid #000000;
+  border-left: 2px solid #000000
 }
 
-.ace-clouds .ace_cursor.ace_overwrite {
+.ace-clouds .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
-  border-bottom: 1px solid #000000;
+  border-bottom: 1px solid #000000
 }
 
 .ace-clouds .ace_marker-layer .ace_selection {
-  background: #BDD5FC;
+  background: #BDD5FC
 }
 
-.ace-clouds.multiselect .ace_selection.start {
+.ace-clouds.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px #FFFFFF;
-  border-radius: 2px;
+  border-radius: 2px
 }
 
 .ace-clouds .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(255, 255, 0)
 }
 
 .ace-clouds .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid #BFBFBF;
+  border: 1px solid #BFBFBF
 }
 
-.ace-clouds .ace_marker-layer .ace_active_line {
-  background: #FFFBD1;
+.ace-clouds .ace_marker-layer .ace_active-line {
+  background: #FFFBD1
 }
 
-.ace-clouds .ace_gutter_active_line {
-  background-color : #dcdcdc;
+.ace-clouds .ace_gutter-active-line {
+  background-color : #dcdcdc
 }
 
-.ace-clouds .ace_marker-layer .ace_selected_word {
-  border: 1px solid #BDD5FC;
+.ace-clouds .ace_marker-layer .ace_selected-word {
+  border: 1px solid #BDD5FC
 }
 
 .ace-clouds .ace_invisible {
-  color: #BFBFBF;
+  color: #BFBFBF
 }
 
-.ace-clouds .ace_keyword, .ace-clouds .ace_meta {
-  color:#AF956F;
+.ace-clouds .ace_keyword,
+.ace-clouds .ace_meta,
+.ace-clouds .ace_support.ace_constant.ace_property-value {
+  color: #AF956F
 }
 
 .ace-clouds .ace_keyword.ace_operator {
-  color:#484848;
+  color: #484848
+}
+
+.ace-clouds .ace_keyword.ace_other.ace_unit {
+  color: #96DC5F
 }
 
 .ace-clouds .ace_constant.ace_language {
-  color:#39946A;
+  color: #39946A
 }
 
 .ace-clouds .ace_constant.ace_numeric {
-  color:#46A609;
+  color: #46A609
 }
 
-.ace-clouds .ace_invalid {
-  background-color:#FF002A;
+.ace-clouds .ace_constant.ace_character.ace_entity {
+  color: #BF78CC
 }
 
-.ace-clouds .ace_fold {
-    background-color: #AF956F;
-    border-color: #000000;
+.ace-clouds .ace_invalid {
+  background-color: #FF002A
 }
 
-.ace-clouds .ace_support.ace_function {
-  color:#C52727;
+.ace-clouds .ace_fold {
+  background-color: #AF956F;
+  border-color: #000000
 }
 
-.ace-clouds .ace_storage {
-  color:#C52727;
+.ace-clouds .ace_storage,
+.ace-clouds .ace_support.ace_class,
+.ace-clouds .ace_support.ace_function,
+.ace-clouds .ace_support.ace_other,
+.ace-clouds .ace_support.ace_type {
+  color: #C52727
 }
 
 .ace-clouds .ace_string {
-  color:#5D90CD;
+  color: #5D90CD
 }
 
 .ace-clouds .ace_comment {
-  color:#BCC8BA;
+  color: #BCC8BA
 }
 
+.ace-clouds .ace_entity.ace_name.ace_tag,
 .ace-clouds .ace_entity.ace_other.ace_attribute-name {
-  color:#606060;
+  color: #606060
 }
 
 .ace-clouds .ace_markup.ace_underline {
-    text-decoration:underline;
+  text-decoration: underline
+}
+
+.ace-clouds .ace_indent-guide {
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y
 }

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

@@ -1,119 +1,125 @@
-
-.ace-clouds-midnight .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-clouds-midnight .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-clouds-midnight .ace_gutter {
   background: #232323;
-  color: #929292;
+  color: #929292
 }
 
-.ace-clouds-midnight .ace_print_margin {
+.ace-clouds-midnight .ace_print-margin {
   width: 1px;
-  background: #232323;
+  background: #232323
 }
 
 .ace-clouds-midnight .ace_scroller {
-  background-color: #191919;
+  background-color: #191919
 }
 
 .ace-clouds-midnight .ace_text-layer {
-  color: #929292;
+  color: #929292
 }
 
 .ace-clouds-midnight .ace_cursor {
-  border-left: 2px solid #7DA5DC;
+  border-left: 2px solid #7DA5DC
 }
 
-.ace-clouds-midnight .ace_cursor.ace_overwrite {
+.ace-clouds-midnight .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
-  border-bottom: 1px solid #7DA5DC;
+  border-bottom: 1px solid #7DA5DC
 }
 
 .ace-clouds-midnight .ace_marker-layer .ace_selection {
-  background: #000000;
+  background: #000000
 }
 
-.ace-clouds-midnight.multiselect .ace_selection.start {
+.ace-clouds-midnight.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px #191919;
-  border-radius: 2px;
+  border-radius: 2px
 }
 
 .ace-clouds-midnight .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(102, 82, 0)
 }
 
 .ace-clouds-midnight .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid #BFBFBF;
+  border: 1px solid #BFBFBF
 }
 
-.ace-clouds-midnight .ace_marker-layer .ace_active_line {
-  background: rgba(215, 215, 215, 0.031);
+.ace-clouds-midnight .ace_marker-layer .ace_active-line {
+  background: rgba(215, 215, 215, 0.031)
 }
 
-.ace-clouds-midnight .ace_gutter_active_line {
-  background-color: rgba(215, 215, 215, 0.031);
+.ace-clouds-midnight .ace_gutter-active-line {
+  background-color: rgba(215, 215, 215, 0.031)
 }
 
-.ace-clouds-midnight .ace_marker-layer .ace_selected_word {
-  border: 1px solid #000000;
+.ace-clouds-midnight .ace_marker-layer .ace_selected-word {
+  border: 1px solid #000000
 }
 
 .ace-clouds-midnight .ace_invisible {
-  color: #BFBFBF;
+  color: #BFBFBF
 }
 
-.ace-clouds-midnight .ace_keyword, .ace-clouds-midnight .ace_meta {
-  color:#927C5D;
+.ace-clouds-midnight .ace_keyword,
+.ace-clouds-midnight .ace_meta,
+.ace-clouds-midnight .ace_support.ace_constant.ace_property-value {
+  color: #927C5D
 }
 
 .ace-clouds-midnight .ace_keyword.ace_operator {
-  color:#4B4B4B;
+  color: #4B4B4B
+}
+
+.ace-clouds-midnight .ace_keyword.ace_other.ace_unit {
+  color: #366F1A
 }
 
 .ace-clouds-midnight .ace_constant.ace_language {
-  color:#39946A;
+  color: #39946A
 }
 
 .ace-clouds-midnight .ace_constant.ace_numeric {
-  color:#46A609;
+  color: #46A609
 }
 
-.ace-clouds-midnight .ace_invalid {
-  color:#FFFFFF;
-background-color:#E92E2E;
+.ace-clouds-midnight .ace_constant.ace_character.ace_entity {
+  color: #A165AC
 }
 
-.ace-clouds-midnight .ace_fold {
-    background-color: #927C5D;
-    border-color: #929292;
+.ace-clouds-midnight .ace_invalid {
+  color: #FFFFFF;
+  background-color: #E92E2E
 }
 
-.ace-clouds-midnight .ace_support.ace_function {
-  color:#E92E2E;
+.ace-clouds-midnight .ace_fold {
+  background-color: #927C5D;
+  border-color: #929292
 }
 
-.ace-clouds-midnight .ace_storage {
-  color:#E92E2E;
+.ace-clouds-midnight .ace_storage,
+.ace-clouds-midnight .ace_support.ace_class,
+.ace-clouds-midnight .ace_support.ace_function,
+.ace-clouds-midnight .ace_support.ace_other,
+.ace-clouds-midnight .ace_support.ace_type {
+  color: #E92E2E
 }
 
 .ace-clouds-midnight .ace_string {
-  color:#5D90CD;
+  color: #5D90CD
 }
 
 .ace-clouds-midnight .ace_comment {
-  color:#3C403B;
+  color: #3C403B
 }
 
+.ace-clouds-midnight .ace_entity.ace_name.ace_tag,
 .ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name {
-  color:#606060;
+  color: #606060
 }
 
 .ace-clouds-midnight .ace_markup.ace_underline {
-    text-decoration:underline;
+  text-decoration: underline
+}
+
+.ace-clouds-midnight .ace_indent-guide {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQlJT8z1BeXv4fAA2KA6+h9Z+2AAAAAElFTkSuQmCC) right repeat-y
 }