diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js index 07bf9383..a5ed08da 100644 --- a/demo/kitchen-sink/demo.js +++ b/demo/kitchen-sink/demo.js @@ -340,6 +340,8 @@ function updateUIEditorOptions() { selectStyleEl.checked = editor.getSelectionStyle() == "line"; themeEl.value = editor.getTheme(); highlightActiveEl.checked = editor.getHighlightActiveLine(); + + editor.setShowInvisibles(true); showHiddenEl.checked = editor.getShowInvisibles(); showGutterEl.checked = editor.renderer.getShowGutter(); showPrintMarginEl.checked = editor.renderer.getShowPrintMargin(); diff --git a/kitchen-sink.html b/kitchen-sink.html index ee49cd28..f3e1463c 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -75,6 +75,7 @@ + diff --git a/lib/ace/theme/comic.js b/lib/ace/theme/comic.js new file mode 100644 index 00000000..1ab63b74 --- /dev/null +++ b/lib/ace/theme/comic.js @@ -0,0 +1,264 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * 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): + * Michael Schwartz + * + * 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. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { + +exports.cssText = ".ace-vibrant-ink .ace_editor {\ + border: 2px solid rgb(159, 159, 159);\ +}\ +\ +.ace-vibrant-ink .ace_editor.ace_focus {\ + border: 2px solid #327fbd;\ +}\ +\ +.ace-vibrant-ink .ace_text-layer {\ + font-family: 'Comic Sans MS';\ +}\ +\ +.ace-vibrant-ink .ace_gutter {\ + width: 50px;\ + background: #e8e8e8;\ + color: #333;\ + overflow : hidden;\ +}\ +\ +.ace-vibrant-ink .ace_gutter-layer {\ + width: 100%;\ + text-align: right;\ +}\ +\ +.ace-vibrant-ink .ace_gutter-layer .ace_gutter-cell {\ + padding-right: 6px;\ +}\ +\ +.ace-vibrant-ink .ace_print_margin {\ + width: 1px;\ + background: #e8e8e8;\ +}\ +\ +.ace-vibrant-ink .ace_scroller {\ + background-color: #0F0F0F;\ +}\ +\ +.ace-vibrant-ink .ace_text-layer {\ + cursor: text;\ + color: #FFFFFF;\ +}\ +\ +.ace-vibrant-ink .ace_cursor {\ + border-left: 2px solid #FFFFFF;\ +}\ +\ +.ace-vibrant-ink .ace_cursor.ace_overwrite {\ + border-left: 0px;\ + border-bottom: 1px solid #FFFFFF;\ +}\ + \ +.ace-vibrant-ink .ace_marker-layer .ace_selection {\ + background: #6699CC;\ +}\ +\ +.ace-vibrant-ink .ace_marker-layer .ace_step {\ + background: rgb(198, 219, 174);\ +}\ +\ +.ace-vibrant-ink .ace_marker-layer .ace_bracket {\ + margin: -1px 0 0 -1px;\ + border: 1px solid #99CC99;\ +}\ +\ +.ace-vibrant-ink .ace_marker-layer .ace_active_line {\ + background: #333333;\ +}\ +\ + \ +.ace-vibrant-ink .ace_invisible {\ + color: #404040;\ +}\ +\ +.ace-vibrant-ink .ace_keyword {\ + color:#FF6600;\ + font-weight: bold;\ +}\ +\ +.ace-vibrant-ink .ace_keyword.ace_operator {\ + \ +}\ +\ +.ace-vibrant-ink .ace_constant {\ + \ +}\ +\ +.ace-vibrant-ink .ace_constant.ace_language {\ + color:#339999;\ +}\ +\ +.ace-vibrant-ink .ace_constant.ace_library {\ + \ +}\ +\ +.ace-vibrant-ink .ace_constant.ace_numeric {\ + color:#99CC99;\ +}\ +\ +.ace-vibrant-ink .ace_invalid {\ + color:#CCFF33;\ + background-color:#000000;\ +}\ +\ +.ace-vibrant-ink .ace_invalid.ace_illegal {\ + \ +}\ +\ +.ace-vibrant-ink .ace_invalid.ace_deprecated {\ + color:#CCFF33;\ + background-color:#000000;\ +}\ +\ +.ace-vibrant-ink .ace_support {\ + \ +}\ +\ +.ace-vibrant-ink .ace_support.ace_function {\ + color:#FFCC00;\ +}\ +\ +.ace-vibrant-ink .ace_function.ace_buildin {\ + \ +}\ +\ +.ace-vibrant-ink .ace_string {\ + color:#66FF00;\ +}\ +\ +.ace-vibrant-ink .ace_string.ace_regexp {\ + color:#44B4CC;\ +}\ +\ +.ace-vibrant-ink .ace_comment {\ + color:#9933CC;\ + font-style: italic;\ +}\ +\ +.ace-vibrant-ink .ace_comment.ace_doc {\ + \ +}\ +\ +.ace-vibrant-ink .ace_comment.ace_doc.ace_tag {\ + \ +}\ +\ +.ace-vibrant-ink .ace_variable {\ + \ +}\ +\ +.ace-vibrant-ink .ace_variable.ace_language {\ + \ +}\ +\ +.ace-vibrant-ink .ace_xml_pe {\ + \ +}\ +\ +.ace-vibrant-ink .ace_meta {\ + \ +}\ +\ +.ace-vibrant-ink .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-vibrant-ink .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name {\ + font-style:italic;\ +color:#99CC99;\ +}\ +\ +.ace-vibrant-ink .ace_entity.ace_name {\ + \ +}\ +\ +.ace-vibrant-ink .ace_entity.ace_name.ace_function {\ + color:#FFCC00;\ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_underline {\ + text-decoration:underline;\ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_heading {\ + \ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_heading.ace_1 {\ + \ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_heading.ace_2 {\ + \ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_heading.ace_3 {\ + \ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_heading.ace_4 {\ + \ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_heading.ace_5 {\ + \ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_heading.ace_6 {\ + \ +}\ +\ +.ace-vibrant-ink .ace_markup.ace_list {\ + \ +}\ +\ +.ace-vibrant-ink .ace_collab.ace_user1 {\ + \ +}"; + +exports.cssClass = "ace-vibrant-ink"; + +}); diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 845b1041..329ba6df 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -79,6 +79,7 @@ exports.cssText = ".ace-tm .ace_editor {\ \ .ace-tm .ace_line .ace_keyword {\ color: blue;\ + font-weight:bold;\ }\ \ .ace-tm .ace_line .ace_constant.ace_buildin {\