gollum 2.4.4 → 2.4.5

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

@@ -1,17 +1,9 @@
-.ace-tm .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-tm .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-tm .ace_gutter {
   background: #f0f0f0;
   color: #333;
 }
 
-.ace-tm .ace_print_margin {
+.ace-tm .ace_print-margin {
   width: 1px;
   background: #e8e8e8;
 }
@@ -20,90 +12,91 @@
     background-color: #6B72E6;
 }
 
-.ace-tm .ace_text-layer {
+.ace-tm .ace_scroller {
+  background-color: #FFFFFF;
 }
 
 .ace-tm .ace_cursor {
   border-left: 2px solid black;
 }
 
-.ace-tm .ace_cursor.ace_overwrite {
+.ace-tm .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
   border-bottom: 1px solid black;
 }
         
-.ace-tm .ace_line .ace_invisible {
+.ace-tm .ace_invisible {
   color: rgb(191, 191, 191);
 }
 
-.ace-tm .ace_line .ace_storage,
-.ace-tm .ace_line .ace_keyword {
+.ace-tm .ace_storage,
+.ace-tm .ace_keyword {
   color: blue;
 }
 
-.ace-tm .ace_line .ace_constant {
+.ace-tm .ace_constant {
   color: rgb(197, 6, 11);
 }
 
-.ace-tm .ace_line .ace_constant.ace_buildin {
+.ace-tm .ace_constant.ace_buildin {
   color: rgb(88, 72, 246);
 }
 
-.ace-tm .ace_line .ace_constant.ace_language {
+.ace-tm .ace_constant.ace_language {
   color: rgb(88, 92, 246);
 }
 
-.ace-tm .ace_line .ace_constant.ace_library {
+.ace-tm .ace_constant.ace_library {
   color: rgb(6, 150, 14);
 }
 
-.ace-tm .ace_line .ace_invalid {
+.ace-tm .ace_invalid {
   background-color: rgba(255, 0, 0, 0.1);
   color: red;
 }
 
-.ace-tm .ace_line .ace_support.ace_function {
+.ace-tm .ace_support.ace_function {
   color: rgb(60, 76, 114);
 }
 
-.ace-tm .ace_line .ace_support.ace_constant {
+.ace-tm .ace_support.ace_constant {
   color: rgb(6, 150, 14);
 }
 
-.ace-tm .ace_line .ace_support.ace_type,
-.ace-tm .ace_line .ace_support.ace_class {
+.ace-tm .ace_support.ace_type,
+.ace-tm .ace_support.ace_class {
   color: rgb(109, 121, 222);
 }
 
-.ace-tm .ace_line .ace_keyword.ace_operator {
+.ace-tm .ace_keyword.ace_operator {
   color: rgb(104, 118, 135);
 }
 
-.ace-tm .ace_line .ace_string {
+.ace-tm .ace_string {
   color: rgb(3, 106, 7);
 }
 
-.ace-tm .ace_line .ace_comment {
+.ace-tm .ace_comment {
   color: rgb(76, 136, 107);
 }
 
-.ace-tm .ace_line .ace_comment.ace_doc {
+.ace-tm .ace_comment.ace_doc {
   color: rgb(0, 102, 255);
 }
 
-.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {
+.ace-tm .ace_comment.ace_doc.ace_tag {
   color: rgb(128, 159, 191);
 }
 
-.ace-tm .ace_line .ace_constant.ace_numeric {
+.ace-tm .ace_constant.ace_numeric {
   color: rgb(0, 0, 205);
 }
 
-.ace-tm .ace_line .ace_variable {
+.ace-tm .ace_variable {
   color: rgb(49, 132, 149);
 }
 
-.ace-tm .ace_line .ace_xml_pe {
+.ace-tm .ace_xml-pe {
   color: rgb(104, 104, 91);
 }
 
@@ -111,9 +104,6 @@
   color: #0000A2;
 }
 
-.ace-tm .ace_markup.ace_markupine {
-    text-decoration:underline;
-}
 
 .ace-tm .ace_markup.ace_heading {
   color: rgb(12, 7, 255);
@@ -123,10 +113,18 @@
   color:rgb(185, 6, 144);
 }
 
+.ace-tm .ace_meta.ace_tag {
+  color:rgb(0, 22, 142);
+}
+
+.ace-tm .ace_string.ace_regex {
+  color: rgb(255, 0, 0)
+}
+
 .ace-tm .ace_marker-layer .ace_selection {
   background: rgb(181, 213, 255);
 }
-.ace-tm.multiselect .ace_selection.start {
+.ace-tm.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px white;
   border-radius: 2px;
 }
@@ -143,23 +141,19 @@
   border: 1px solid rgb(192, 192, 192);
 }
 
-.ace-tm .ace_marker-layer .ace_active_line {
+.ace-tm .ace_marker-layer .ace_active-line {
   background: rgba(0, 0, 0, 0.07);
 }
 
-.ace-tm .ace_gutter_active_line {
+.ace-tm .ace_gutter-active-line {
     background-color : #dcdcdc;
 }
 
-.ace-tm .ace_marker-layer .ace_selected_word {
+.ace-tm .ace_marker-layer .ace_selected-word {
   background: rgb(250, 250, 255);
   border: 1px solid rgb(200, 200, 250);
 }
 
-.ace-tm .ace_meta.ace_tag {
-  color:rgb(0, 50, 198);
+.ace-tm .ace_indent-guide {
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;
 }
-
-.ace-tm .ace_string.ace_regex {
-  color: rgb(255, 0, 0)
-}

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/theme/textmate.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 ***** */
 
@@ -40,7 +33,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-tm";
-exports.cssText = require('ace/requirejs/text!./textmate.css');
+exports.cssText = require("../requirejs/text!./textmate.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

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

@@ -1,164 +1,136 @@
-
-.ace-tomorrow .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.ace-tomorrow .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .ace-tomorrow .ace_gutter {
   background: #f6f6f6;
-  color: #4D4D4C;
+  color: #4D4D4C
 }
 
-.ace-tomorrow .ace_print_margin {
+.ace-tomorrow .ace_print-margin {
   width: 1px;
-  background: #f6f6f6;
+  background: #f6f6f6
 }
 
 .ace-tomorrow .ace_scroller {
-  background-color: #FFFFFF;
+  background-color: #FFFFFF
 }
 
 .ace-tomorrow .ace_text-layer {
-  color: #4D4D4C;
+  color: #4D4D4C
 }
 
 .ace-tomorrow .ace_cursor {
-  border-left: 2px solid #AEAFAD;
+  border-left: 2px solid #AEAFAD
 }
 
-.ace-tomorrow .ace_cursor.ace_overwrite {
+.ace-tomorrow .ace_overwrite-cursors .ace_cursor {
   border-left: 0px;
-  border-bottom: 1px solid #AEAFAD;
+  border-bottom: 1px solid #AEAFAD
 }
 
 .ace-tomorrow .ace_marker-layer .ace_selection {
-  background: #D6D6D6;
+  background: #D6D6D6
 }
 
-.ace-tomorrow.multiselect .ace_selection.start {
+.ace-tomorrow.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px #FFFFFF;
-  border-radius: 2px;
+  border-radius: 2px
 }
 
 .ace-tomorrow .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(255, 255, 0)
 }
 
 .ace-tomorrow .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid #D1D1D1;
+  border: 1px solid #D1D1D1
 }
 
-.ace-tomorrow .ace_marker-layer .ace_active_line {
-  background: #EFEFEF;
+.ace-tomorrow .ace_marker-layer .ace_active-line {
+  background: #EFEFEF
 }
 
-.ace-tomorrow .ace_gutter_active_line {
-  background-color : #dcdcdc;
+.ace-tomorrow .ace_gutter-active-line {
+  background-color : #dcdcdc
 }
 
-.ace-tomorrow .ace_marker-layer .ace_selected_word {
-  border: 1px solid #D6D6D6;
+.ace-tomorrow .ace_marker-layer .ace_selected-word {
+  border: 1px solid #D6D6D6
 }
 
 .ace-tomorrow .ace_invisible {
-  color: #D1D1D1;
+  color: #D1D1D1
 }
 
-.ace-tomorrow .ace_keyword, .ace-tomorrow .ace_meta {
-  color:#8959A8;
+.ace-tomorrow .ace_keyword,
+.ace-tomorrow .ace_meta,
+.ace-tomorrow .ace_storage,
+.ace-tomorrow .ace_storage.ace_type,
+.ace-tomorrow .ace_support.ace_type {
+  color: #8959A8
 }
 
 .ace-tomorrow .ace_keyword.ace_operator {
-  color:#3E999F;
-}
-
-.ace-tomorrow .ace_constant.ace_language {
-  color:#F5871F;
+  color: #3E999F
 }
 
-.ace-tomorrow .ace_constant.ace_numeric {
-  color:#F5871F;
+.ace-tomorrow .ace_constant.ace_character,
+.ace-tomorrow .ace_constant.ace_language,
+.ace-tomorrow .ace_constant.ace_numeric,
+.ace-tomorrow .ace_keyword.ace_other.ace_unit,
+.ace-tomorrow .ace_support.ace_constant,
+.ace-tomorrow .ace_variable.ace_parameter {
+  color: #F5871F
 }
 
 .ace-tomorrow .ace_constant.ace_other {
-  color:#666969;
+  color: #666969
 }
 
 .ace-tomorrow .ace_invalid {
-  color:#FFFFFF;
-background-color:#C82829;
+  color: #FFFFFF;
+  background-color: #C82829
 }
 
 .ace-tomorrow .ace_invalid.ace_deprecated {
-  color:#FFFFFF;
-background-color:#8959A8;
-}
-
-.ace-tomorrow .ace_support.ace_constant {
-  color:#F5871F;
+  color: #FFFFFF;
+  background-color: #8959A8
 }
 
 .ace-tomorrow .ace_fold {
-    background-color: #4271AE;
-    border-color: #4D4D4C;
-}
-
-.ace-tomorrow .ace_support.ace_function {
-  color:#4271AE;
-}
-
-.ace-tomorrow .ace_storage {
-  color:#8959A8;
-}
-
-.ace-tomorrow .ace_storage.ace_type,  .ace-tomorrow .ace_support.ace_type{
-  color:#8959A8;
+  background-color: #4271AE;
+  border-color: #4D4D4C
 }
 
+.ace-tomorrow .ace_entity.ace_name.ace_function,
+.ace-tomorrow .ace_support.ace_function,
 .ace-tomorrow .ace_variable {
-  color:#4271AE;
+  color: #4271AE
 }
 
-.ace-tomorrow .ace_variable.ace_parameter {
-  color:#F5871F;
+.ace-tomorrow .ace_support.ace_class,
+.ace-tomorrow .ace_support.ace_type {
+  color: #C99E00
 }
 
+.ace-tomorrow .ace_markup.ace_heading,
 .ace-tomorrow .ace_string {
-  color:#718C00;
-}
-
-.ace-tomorrow .ace_string.ace_regexp {
-  color:#C82829;
-}
-
-.ace-tomorrow .ace_comment {
-  color:#8E908C;
+  color: #718C00
 }
 
+.ace-tomorrow .ace_entity.ace_name.ace_tag,
+.ace-tomorrow .ace_entity.ace_other.ace_attribute-name,
+.ace-tomorrow .ace_meta.ace_tag,
+.ace-tomorrow .ace_string.ace_regexp,
 .ace-tomorrow .ace_variable {
-  color:#C82829;
-}
-
-.ace-tomorrow .ace_meta.ace_tag {
-  color:#C82829;
+  color: #C82829
 }
 
-.ace-tomorrow .ace_entity.ace_other.ace_attribute-name {
-  color:#C82829;
-}
-
-.ace-tomorrow .ace_entity.ace_name.ace_function {
-  color:#4271AE;
+.ace-tomorrow .ace_comment {
+  color: #8E908C
 }
 
 .ace-tomorrow .ace_markup.ace_underline {
-    text-decoration:underline;
+  text-decoration: underline
 }
 
-.ace-tomorrow .ace_markup.ace_heading {
-  color:#718C00;
+.ace-tomorrow .ace_indent-guide {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y
 }