From d1f6d4408fa70664732f9d39fc0963b28681f14b Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Sun, 29 May 2022 16:03:31 +0200 Subject: [PATCH] fix: Multiple improvements for Ace themes --- lib/ace/autocomplete/popup.js | 43 +++--- lib/ace/css/editor.css | 4 - lib/ace/ext/themelist.js | 2 +- lib/ace/theme/chrome.css | 6 +- lib/ace/theme/cloud9_day.css | 156 ++++++++++++++++++++++ lib/ace/theme/cloud9_day.js | 40 ++++++ lib/ace/theme/cloud9_night.css | 142 ++++++++++++++++++++ lib/ace/theme/cloud9_night.js | 38 ++++++ lib/ace/theme/cloud9_night_low_color.css | 130 ++++++++++++++++++ lib/ace/theme/cloud9_night_low_color.js | 38 ++++++ lib/ace/theme/merbivore.css | 4 +- lib/ace/theme/merbivore_soft.css | 4 +- lib/ace/theme/tomorrow.css | 4 +- lib/ace/theme/tomorrow_night.css | 4 +- lib/ace/theme/tomorrow_night_blue.css | 4 +- lib/ace/theme/tomorrow_night_bright.css | 4 +- lib/ace/theme/tomorrow_night_eighties.css | 4 +- lib/ace/theme/xcode.css | 4 +- 18 files changed, 595 insertions(+), 36 deletions(-) create mode 100644 lib/ace/theme/cloud9_day.css create mode 100644 lib/ace/theme/cloud9_day.js create mode 100644 lib/ace/theme/cloud9_night.css create mode 100644 lib/ace/theme/cloud9_night.js create mode 100644 lib/ace/theme/cloud9_night_low_color.css create mode 100644 lib/ace/theme/cloud9_night_low_color.js diff --git a/lib/ace/autocomplete/popup.js b/lib/ace/autocomplete/popup.js index 4ee7c383d14..a556ad9c521 100644 --- a/lib/ace/autocomplete/popup.js +++ b/lib/ace/autocomplete/popup.js @@ -320,40 +320,43 @@ var AcePopup = function(parentNode) { }; dom.importCssString("\ -.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\ +.ace_autocomplete.ace-tm .ace_marker-layer .ace_active-line {\ background-color: #CAD6FA;\ z-index: 1;\ }\ -.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\ - background-color: #3a674e;\ -}\ -.ace_editor.ace_autocomplete .ace_line-hover {\ +.ace_autocomplete.ace-tm .ace_line-hover {\ border: 1px solid #abbffe;\ margin-top: -1px;\ background: rgba(233,233,253,0.4);\ +}\ +.ace_autocomplete .ace_line-hover {\ position: absolute;\ z-index: 2;\ }\ -.ace_dark.ace_editor.ace_autocomplete .ace_line-hover {\ - border: 1px solid rgba(109, 150, 13, 0.8);\ - background: rgba(58, 103, 78, 0.62);\ +.ace_autocomplete .ace_scroller {\ + background: none;\ + border: none;\ + box-shadow: none;\ }\ -.ace_completion-meta {\ - opacity: 0.5;\ - margin: 0.9em;\ +.ace_rightAlignedText {\ + color: gray;\ + display: inline-block;\ + position: absolute;\ + right: 4px;\ + text-align: right;\ + z-index: -1;\ }\ .ace_completion-message {\ color: blue;\ }\ -.ace_editor.ace_autocomplete .ace_completion-highlight{\ - color: #2d69c7;\ +.ace_autocomplete .ace_completion-highlight{\ color: #000;\ + text-shadow: 0 0 0.01em;\ }\ -.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight{\ - color: #93ca12;\ -}\ -.ace_editor.ace_autocomplete {\ - width: 300px;\ +.ace_autocomplete {\ + width: 280px;\ z-index: 200000;\ + background: #fbfbfb;\ + color: #444;\ border: 1px lightgray solid;\ position: fixed;\ box-shadow: 2px 3px 5px rgba(0,0,0,.2);\ @@ -371,6 +374,4 @@ dom.importCssString("\ exports.AcePopup = AcePopup; exports.$singleLineEditor = $singleLineEditor; -}); - - +}); \ No newline at end of file diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index cf65fb83fbb..e2a81d796c8 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -71,10 +71,6 @@ styles.join("\n") background: rgba(0, 0, 0, 0.01); } -.ace_selecting, .ace_selecting * { - cursor: text !important; -} - .ace_gutter { position: absolute; overflow : hidden; diff --git a/lib/ace/ext/themelist.js b/lib/ace/ext/themelist.js index aa25ba87e8b..b2d90e49fda 100644 --- a/lib/ace/ext/themelist.js +++ b/lib/ace/ext/themelist.js @@ -54,7 +54,7 @@ var themeData = [ ["Solarized Light"], ["TextMate" ], ["Tomorrow" ], - ["Xcode" ], + ["XCode" ], ["Kuroir"], ["KatzenMilch"], ["SQL Server" ,"sqlserver" , "light"], diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index c91e802afeb..ff08fd4de80 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -80,7 +80,9 @@ color: rgb(0, 0, 205); } -.ace-chrome .ace_variable { +.ace-chrome .ace_variable, +.ace-chrome .ace_variable:not(.ace_parameter), +.ace-chrome .ace_constant:not(.ace_numeric) { color: rgb(49, 132, 149); } @@ -151,4 +153,4 @@ .ace-chrome .ace_indent-guide { background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y; -} +} \ No newline at end of file diff --git a/lib/ace/theme/cloud9_day.css b/lib/ace/theme/cloud9_day.css new file mode 100644 index 00000000000..8df0dbe5dda --- /dev/null +++ b/lib/ace/theme/cloud9_day.css @@ -0,0 +1,156 @@ +.ace-cloud9-day .ace_gutter { + background: #ECECEC; + color: #333; +} + +.ace-cloud9-day .ace_print-margin { + width: 1px; + background: #e8e8e8; +} + +.ace-cloud9-day .ace_fold { + background-color: #6B72E6; +} + +.ace-cloud9-day { + background-color: #FBFBFB; + color: black; +} + +.ace-cloud9-day .ace_cursor { + color: black; +} + +.ace-cloud9-day .ace_invisible { + color: rgb(191, 191, 191); +} + +.ace-cloud9-day .ace_storage, +.ace-cloud9-day .ace_keyword { + color: rgb(24, 122, 234); +} + +.ace-cloud9-day .ace_constant { + color: rgb(197, 6, 11); +} + +.ace-cloud9-day .ace_constant.ace_buildin { + color: rgb(88, 72, 246); +} + +.ace-cloud9-day .ace_constant.ace_language { + color: rgb(88, 92, 246); +} + +.ace-cloud9-day .ace_constant.ace_library { + color: rgb(6, 150, 14); +} + +.ace-cloud9-day .ace_invalid { + background-color: rgba(255, 0, 0, 0.1); + color: red; +} + +.ace-cloud9-day .ace_support.ace_function { + color: rgb(60, 76, 114); +} + +.ace-cloud9-day .ace_support.ace_constant { + color: rgb(6, 150, 14); +} + +.ace-cloud9-day .ace_support.ace_type, +.ace-cloud9-day .ace_support.ace_class { + color: rgb(109, 121, 222); +} + +.ace-cloud9-day .ace_keyword.ace_operator { + color: rgb(104, 118, 135); +} + +.ace-cloud9-day .ace_string { + color: rgb(3, 106, 7); +} + +.ace-cloud9-day .ace_comment { + color: rgb(76, 136, 107); +} + +.ace-cloud9-day .ace_comment.ace_doc { + color: rgb(0, 102, 255); +} + +.ace-cloud9-day .ace_comment.ace_doc.ace_tag { + color: rgb(128, 159, 191); +} + +.ace-cloud9-day .ace_constant.ace_numeric { + color: rgb(0, 0, 205); +} + +.ace-cloud9-day .ace_variable { + color: rgb(49, 132, 149); +} + +.ace-cloud9-day .ace_xml-pe { + color: rgb(104, 104, 91); +} + +.ace-cloud9-day .ace_entity.ace_name.ace_function { + color: #0000A2; +} + + +.ace-cloud9-day .ace_heading { + color: rgb(12, 7, 255); +} + +.ace-cloud9-day .ace_list { + color: rgb(185, 6, 144); +} + +.ace-cloud9-day .ace_meta.ace_tag { + color: rgb(0, 22, 142); +} + +.ace-cloud9-day .ace_string.ace_regex { + color: rgb(255, 0, 0) +} + +.ace-cloud9-day .ace_marker-layer .ace_selection { + background: rgb(181, 213, 255); +} + +.ace-cloud9-day.ace_multiselect .ace_selection.ace_start { + box-shadow: 0 0 3px 0px white; +} + +.ace-cloud9-day .ace_marker-layer .ace_step { + background: rgb(247, 237, 137); +} + +.ace-cloud9-day .ace_marker-layer .ace_stack { + background: #BAE0A0; +} + +.ace-cloud9-day .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px; + border: 1px solid rgb(192, 192, 192); +} + +.ace-cloud9-day .ace_marker-layer .ace_active-line { + background: rgba(0, 0, 0, 0.07); +} + +.ace-cloud9-day .ace_gutter-active-line { + background-color: #E5E5E5; +} + +.ace-cloud9-day .ace_marker-layer .ace_selected-word { + background: rgb(250, 250, 255); + border: 1px solid rgb(200, 200, 250); +} + +.ace-cloud9-day .ace_indent-guide { + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y; +} \ No newline at end of file diff --git a/lib/ace/theme/cloud9_day.js b/lib/ace/theme/cloud9_day.js new file mode 100644 index 00000000000..7e999aec70b --- /dev/null +++ b/lib/ace/theme/cloud9_day.js @@ -0,0 +1,40 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * 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) { + "use strict"; + + exports.isDark = false; + exports.cssClass = "ace-cloud9-day"; + exports.cssText = require("../requirejs/text!./cloud9_day.css"); + + var dom = require("../lib/dom"); + dom.importCssString(exports.cssText, exports.cssClass); +}); diff --git a/lib/ace/theme/cloud9_night.css b/lib/ace/theme/cloud9_night.css new file mode 100644 index 00000000000..5577fd2d454 --- /dev/null +++ b/lib/ace/theme/cloud9_night.css @@ -0,0 +1,142 @@ +.ace-cloud9-night .ace_gutter { + background: #303130; + color: #eee +} + +.ace-cloud9-night .ace_print-margin { + width: 1px; + background: #222 +} + +.ace-cloud9-night { + background-color: #181818; + color: #EBEBEB +} + +.ace-cloud9-night .ace_cursor { + color: #9F9F9F +} + +.ace-cloud9-night .ace_marker-layer .ace_selection { + background: #424242 +} + +.ace-cloud9-night.ace_multiselect .ace_selection.ace_start { + box-shadow: 0 0 3px 0px #000000; + border-radius: 2px +} + +.ace-cloud9-night .ace_marker-layer .ace_step { + background: rgb(102, 82, 0) +} + +.ace-cloud9-night .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px; + border: 1px solid #888888 +} + +.ace-cloud9-night .ace_marker-layer .ace_highlight { + border: 1px solid rgb(110, 119, 0); + border-bottom: 0; + box-shadow: inset 0 -1px rgb(110, 119, 0); + margin: -1px 0 0 -1px; + background: rgba(255, 235, 0, 0.1); +} + +.ace-cloud9-night .ace_marker-layer .ace_active-line { + background: #292929 +} + +.ace-cloud9-night .ace_gutter-active-line { + background-color: #3D3D3D +} + +.ace-cloud9-night .ace_stack { + background-color: rgb(66, 90, 44) +} + +.ace-cloud9-night .ace_marker-layer .ace_selected-word { + border: 1px solid #888888 +} + +.ace-cloud9-night .ace_invisible { + color: #343434 +} + +.ace-cloud9-night .ace_keyword, +.ace-cloud9-night .ace_meta, +.ace-cloud9-night .ace_storage, +.ace-cloud9-night .ace_storage.ace_type, +.ace-cloud9-night .ace_support.ace_type { + color: #C397D8 +} + +.ace-cloud9-night .ace_keyword.ace_operator { + color: #70C0B1 +} + +.ace-cloud9-night .ace_constant.ace_character, +.ace-cloud9-night .ace_constant.ace_language, +.ace-cloud9-night .ace_constant.ace_numeric, +.ace-cloud9-night .ace_keyword.ace_other.ace_unit, +.ace-cloud9-night .ace_support.ace_constant, +.ace-cloud9-night .ace_variable.ace_parameter { + color: #E78C45 +} + +.ace-cloud9-night .ace_constant.ace_other { + color: #EEEEEE +} + +.ace-cloud9-night .ace_invalid { + color: #CED2CF; + background-color: #DF5F5F +} + +.ace-cloud9-night .ace_invalid.ace_deprecated { + color: #CED2CF; + background-color: #B798BF +} + +.ace-cloud9-night .ace_fold { + background-color: #7AA6DA; + border-color: #DEDEDE +} + +.ace-cloud9-night .ace_entity.ace_name.ace_function, +.ace-cloud9-night .ace_support.ace_function, +.ace-cloud9-night .ace_variable:not(.ace_parameter), +.ace-cloud9-night .ace_constant:not(.ace_numeric) { + color: #7AA6DA +} + +.ace-cloud9-night .ace_support.ace_class, +.ace-cloud9-night .ace_support.ace_type { + color: #E7C547 +} + +.ace-cloud9-night .ace_heading, +.ace-cloud9-night .ace_markup.ace_heading, +.ace-cloud9-night .ace_string { + color: #B9CA4A +} + +.ace-cloud9-night .ace_entity.ace_name.ace_tag, +.ace-cloud9-night .ace_entity.ace_other.ace_attribute-name, +.ace-cloud9-night .ace_meta.ace_tag, +.ace-cloud9-night .ace_string.ace_regexp, +.ace-cloud9-night .ace_variable { + color: #D54E53 +} + +.ace-cloud9-night .ace_comment { + color: #969896 +} + +.ace-cloud9-night .ace_c9searchresults.ace_keyword { + color: #C2C280; +} + +.ace-cloud9-night .ace_indent-guide { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y +} \ No newline at end of file diff --git a/lib/ace/theme/cloud9_night.js b/lib/ace/theme/cloud9_night.js new file mode 100644 index 00000000000..b88197f6316 --- /dev/null +++ b/lib/ace/theme/cloud9_night.js @@ -0,0 +1,38 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * 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 = true; + exports.cssClass = "ace-cloud9-night"; + exports.cssText = require("../requirejs/text!./cloud9_night.css"); + + var dom = require("../lib/dom"); + dom.importCssString(exports.cssText, exports.cssClass); +}); diff --git a/lib/ace/theme/cloud9_night_low_color.css b/lib/ace/theme/cloud9_night_low_color.css new file mode 100644 index 00000000000..bbeaf269091 --- /dev/null +++ b/lib/ace/theme/cloud9_night_low_color.css @@ -0,0 +1,130 @@ +.ace-cloud9-night-low-color .ace_gutter { + background: #303130; + color: #eee +} + +.ace-cloud9-night-low-color .ace_print-margin { + width: 1px; + background: #222 +} + +.ace-cloud9-night-low-color { + background-color: #181818; + color: #EBEBEB +} + +.ace-cloud9-night-low-color .ace_cursor { + color: #9F9F9F +} + +.ace-cloud9-night-low-color .ace_marker-layer .ace_selection { + background: #424242 +} + +.ace-cloud9-night-low-color.ace_multiselect .ace_selection.ace_start { + box-shadow: 0 0 3px 0px #000000; + border-radius: 2px +} + +.ace-cloud9-night-low-color .ace_marker-layer .ace_step { + background: rgb(102, 82, 0) +} + +.ace-cloud9-night-low-color .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px; + border: 1px solid #888888 +} + +.ace-cloud9-night-low-color .ace_marker-layer .ace_highlight { + border: 1px solid rgb(110, 119, 0); + border-bottom: 0; + box-shadow: inset 0 -1px rgb(110, 119, 0); + margin: -1px 0 0 -1px; + background: rgba(255, 235, 0, 0.1); +} + +.ace-cloud9-night-low-color .ace_marker-layer .ace_active-line { + background: #292929 +} + +.ace-cloud9-night-low-color .ace_gutter-active-line { + background-color: #3D3D3D +} + +.ace-cloud9-night-low-color .ace_stack { + background-color: rgb(66, 90, 44) +} + +.ace-cloud9-night-low-color .ace_marker-layer .ace_selected-word { + border: 1px solid #888888 +} + +.ace-cloud9-night-low-color .ace_invisible { + color: #343434 +} + +.ace-cloud9-night-low-color .ace_keyword, +.ace-cloud9-night-low-color .ace_meta, +.ace-cloud9-night-low-color .ace_storage { + color: #C397D8 +} + +.ace-cloud9-night-low-color .ace_keyword.ace_operator { + color: #70C0B1 +} + +.ace-cloud9-night-low-color .ace_constant.ace_character, +.ace-cloud9-night-low-color .ace_constant.ace_language, +.ace-cloud9-night-low-color .ace_constant.ace_numeric, +.ace-cloud9-night-low-color .ace_keyword.ace_other.ace_unit { + color: #DAA637 +} + +.ace-cloud9-night-low-color .ace_constant.ace_other { + color: #EEEEEE +} + +.ace-cloud9-night-low-color .ace_invalid { + color: #CED2CF; + background-color: #DF5F5F +} + +.ace-cloud9-night-low-color .ace_invalid.ace_deprecated { + color: #CED2CF; + background-color: #B798BF +} + +.ace-cloud9-night-low-color .ace_fold { + background-color: #7AA6DA; + border-color: #DEDEDE +} + +.ace-cloud9-night-low-color .ace_entity.ace_name.ace_function, +.ace-cloud9-night-low-color .ace_support.ace_function, +.ace-cloud9-night-low-color .ace_variable:not(.ace_parameter), +.ace-cloud9-night-low-color .ace_constant:not(.ace_numeric) { + color: #7AA6DA +} + +.ace-cloud9-night-low-color .ace_support.ace_class, +.ace-cloud9-night-low-color .ace_support.ace_type { + color: #E7C547 +} + +.ace-cloud9-night-low-color .ace_heading, +.ace-cloud9-night-low-color .ace_markup.ace_heading, +.ace-cloud9-night-low-color .ace_string { + color: #B9CA4A +} + +.ace-cloud9-night-low-color .ace_comment { + color: #969896 +} + +.ace-cloud9-night-low-color .ace_c9searchresults.ace_keyword { + color: #C2C280; +} + +.ace-cloud9-night-low-color .ace_indent-guide { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y +} \ No newline at end of file diff --git a/lib/ace/theme/cloud9_night_low_color.js b/lib/ace/theme/cloud9_night_low_color.js new file mode 100644 index 00000000000..7d24cc55ce3 --- /dev/null +++ b/lib/ace/theme/cloud9_night_low_color.js @@ -0,0 +1,38 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * 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 = true; + exports.cssClass = "ace-cloud9-night-low-color"; + exports.cssText = require("../requirejs/text!./cloud9_night_low_color.css"); + + var dom = require("../lib/dom"); + dom.importCssString(exports.cssText, exports.cssClass); +}); diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index 9be25c6696c..fc2c00d4250 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -63,7 +63,9 @@ .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 { +.ace-merbivore .ace_support.ace_type, +.ace-merbivore .ace_variable:not(.ace_parameter), +.ace-merbivore .ace_constant:not(.ace_numeric) { color: #1EDAFB } diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index 0d615376087..6087ffdaec7 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -62,7 +62,9 @@ .ace-merbivore-soft .ace_constant.ace_character, .ace-merbivore-soft .ace_constant.ace_character.ace_escape, .ace-merbivore-soft .ace_constant.ace_other, -.ace-merbivore-soft .ace_support.ace_type { +.ace-merbivore-soft .ace_support.ace_type, +.ace-merbivore-soft .ace_variable:not(.ace_parameter), +.ace-merbivore-soft .ace_constant:not(.ace_numeric) { color: #68C1D8 } diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index 77407e662de..b2c50a18f97 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -92,7 +92,9 @@ .ace-tomorrow .ace_entity.ace_name.ace_function, .ace-tomorrow .ace_support.ace_function, -.ace-tomorrow .ace_variable { +.ace-tomorrow .ace_variable, +.ace-tomorrow .ace_variable:not(.ace_parameter), +.ace-tomorrow .ace_constant:not(.ace_numeric) { color: #4271AE } diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index e98a6580102..15d7788d86e 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -92,7 +92,9 @@ .ace-tomorrow-night .ace_entity.ace_name.ace_function, .ace-tomorrow-night .ace_support.ace_function, -.ace-tomorrow-night .ace_variable { +.ace-tomorrow-night .ace_variable, +.ace-tomorrow-night .ace_variable:not(.ace_parameter), +.ace-tomorrow-night .ace_constant:not(.ace_numeric) { color: #81A2BE } diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index 907eef35386..f2ee81a2ac3 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -89,7 +89,9 @@ .ace-tomorrow-night-blue .ace_entity.ace_name.ace_function, .ace-tomorrow-night-blue .ace_support.ace_function, -.ace-tomorrow-night-blue .ace_variable { +.ace-tomorrow-night-blue .ace_variable, +.ace-tomorrow-night-blue .ace_variable:not(.ace_parameter), +.ace-tomorrow-night-blue .ace_constant:not(.ace_numeric) { color: #BBDAFF } diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index c0c33739a33..bc3d1b37690 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -104,7 +104,9 @@ .ace-tomorrow-night-bright .ace_entity.ace_name.ace_function, .ace-tomorrow-night-bright .ace_support.ace_function, -.ace-tomorrow-night-bright .ace_variable { +.ace-tomorrow-night-bright .ace_variable, +.ace-tomorrow-night-bright .ace_variable:not(.ace_parameter), +.ace-tomorrow-night-bright .ace_constant:not(.ace_numeric) { color: #7AA6DA } diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 69277fb1a9a..fa5081d5c38 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -93,7 +93,9 @@ .ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function, .ace-tomorrow-night-eighties .ace_support.ace_function, -.ace-tomorrow-night-eighties .ace_variable { +.ace-tomorrow-night-eighties .ace_variable, +.ace-tomorrow-night-eighties .ace_variable:not(.ace_parameter), +.ace-tomorrow-night-eighties .ace_constant:not(.ace_numeric) { color: #6699CC } diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css index a22bd16999b..983ebc26976 100644 --- a/lib/ace/theme/xcode.css +++ b/lib/ace/theme/xcode.css @@ -70,7 +70,9 @@ .ace-xcode .ace_entity.ace_other.ace_attribute-name, .ace-xcode .ace_support.ace_constant, -.ace-xcode .ace_support.ace_function { +.ace-xcode .ace_support.ace_function, +.ace-xcode .ace_variable:not(.ace_parameter), +.ace-xcode .ace_constant:not(.ace_numeric) { color: #450084 }