From 4d88770435f1700b8de66630d97fef8b3d82b890 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Oct 2013 17:33:54 +0400 Subject: [PATCH 1/2] fix bug in converter and add two new themes --- lib/ace/theme/clouds_midnight.css | 4 +- lib/ace/theme/cobalt.css | 22 ++-- lib/ace/theme/dawn.css | 12 +- lib/ace/theme/idle_fingers.css | 2 +- lib/ace/theme/katzenmilch.css | 140 ++++++++++++++++++++++ lib/ace/theme/katzenmilch.js | 39 ++++++ lib/ace/theme/kr_theme.css | 11 +- lib/ace/theme/kuroir.css | 68 +++++++++++ lib/ace/theme/kuroir.js | 39 ++++++ lib/ace/theme/merbivore.css | 2 +- lib/ace/theme/merbivore_soft.css | 2 +- lib/ace/theme/mono_industrial.css | 2 +- lib/ace/theme/monokai.css | 2 +- lib/ace/theme/pastel_on_dark.css | 2 +- lib/ace/theme/solarized_dark.css | 9 +- lib/ace/theme/solarized_light.css | 4 +- lib/ace/theme/tomorrow.css | 1 + lib/ace/theme/tomorrow_night.css | 5 +- lib/ace/theme/tomorrow_night_blue.css | 8 +- lib/ace/theme/tomorrow_night_bright.css | 5 +- lib/ace/theme/tomorrow_night_eighties.css | 6 +- lib/ace/theme/twilight.css | 4 +- lib/ace/theme/vibrant_ink.css | 2 +- lib/ace/theme/xcode.css | 1 + tool/tmtheme.js | 5 + 25 files changed, 346 insertions(+), 51 deletions(-) create mode 100644 lib/ace/theme/katzenmilch.css create mode 100644 lib/ace/theme/katzenmilch.js create mode 100644 lib/ace/theme/kuroir.css create mode 100644 lib/ace/theme/kuroir.js diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index 87e22465..8d23bcbe 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -8,7 +8,7 @@ background: #232323 } -.ace-clouds-midnight{ +.ace-clouds-midnight { background-color: #191919; color: #929292 } @@ -109,5 +109,5 @@ } .ace-clouds-midnight .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index 7febd9ac..22df0460 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -106,6 +106,17 @@ color: #0088FF } +.ace-cobalt .ace_heading, +.ace-cobalt .ace_markup.ace_heading { + color: #C8E4FD; + background-color: #001221 +} + +.ace-cobalt .ace_list, +.ace-cobalt .ace_markup.ace_list { + background-color: #130D26 +} + .ace-cobalt .ace_variable { color: #CCCCCC } @@ -118,15 +129,6 @@ color: #9EFFFF } -.ace-cobalt .ace_heading { - color: #C8E4FD; - background-color: #001221 -} - -.ace-cobalt .ace_list { - background-color: #130D26 -} - .ace-cobalt .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHCLSvkPAAP3AgSDTRd4AAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHCLSvkPAAP3AgSDTRd4AAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index c1a89e32..719f4877 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -90,6 +90,7 @@ } .ace-dawn .ace_list, +.ace-dawn .ace_markup.ace_list, .ace-dawn .ace_support.ace_function { color: #693A17 } @@ -112,14 +113,15 @@ color: #5A525F } +.ace-dawn .ace_heading, +.ace-dawn .ace_markup.ace_heading { + color: #19356D +} + .ace-dawn .ace_variable { color: #234A97 } -.ace-dawn .ace_heading { - color: #19356D -} - .ace-dawn .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLh/5+x/AAizA4hxNNsZAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLh/5+x/AAizA4hxNNsZAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index 6a4d02d5..91318b30 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -109,5 +109,5 @@ } .ace-idle-fingers .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMwMjLyZYiPj/8PAAreAwAI1+g0AAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMwMjLyZYiPj/8PAAreAwAI1+g0AAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/katzenmilch.css b/lib/ace/theme/katzenmilch.css new file mode 100644 index 00000000..e2526b93 --- /dev/null +++ b/lib/ace/theme/katzenmilch.css @@ -0,0 +1,140 @@ +.ace-katzenmilch .ace_gutter, +/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: ) */ + +.ace-katzenmilch .ace_gutter { + background: #e8e8e8; + color: #333 +} + +.ace-katzenmilch .ace_print-margin { + width: 1px; + background: #e8e8e8 +} + +.ace-katzenmilch { + background-color: #f3f2f3; + color: rgba(15, 0, 9, 1.0) +} + +.ace-katzenmilch .ace_cursor { + border-left: 2px solid #100011 +} + +.ace-katzenmilch .ace_overwrite-cursors .ace_cursor { + border-left: 0px; + border-bottom: 1px solid #100011 +} + +.ace-katzenmilch .ace_marker-layer .ace_selection { + background: rgba(100, 5, 208, 0.27) +} + +.ace-katzenmilch.ace_multiselect .ace_selection.ace_start { + box-shadow: 0 0 3px 0px #f3f2f3; + border-radius: 2px +} + +.ace-katzenmilch .ace_marker-layer .ace_step { + background: rgb(198, 219, 174) +} + +.ace-katzenmilch .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px; + border: 1px solid #000000 +} + +.ace-katzenmilch .ace_marker-layer .ace_active-line { + background: rgb(232, 242, 254) +} + +.ace-katzenmilch .ace_gutter-active-line { + background-color: rgb(232, 242, 254) +} + +.ace-katzenmilch .ace_marker-layer .ace_selected-word { + border: 1px solid rgba(100, 5, 208, 0.27) +} + +.ace-katzenmilch .ace_fold { + background-color: rgba(2, 95, 73, 0.97); + border-color: rgba(15, 0, 9, 1.0) +} + +.ace-katzenmilch .ace_keyword { + color: #674Aa8; + rbackground-color: rgba(163, 170, 216, 0.055) +} + +.ace-katzenmilch .ace_constant.ace_language { + color: #7D7e52; + rbackground-color: rgba(189, 190, 130, 0.059) +} + +.ace-katzenmilch .ace_constant.ace_numeric { + color: rgba(79, 130, 123, 0.93); + rbackground-color: rgba(119, 194, 187, 0.059) +} + +.ace-katzenmilch .ace_constant.ace_character, +.ace-katzenmilch .ace_constant.ace_other { + color: rgba(2, 95, 105, 1.0); + rbackground-color: rgba(127, 34, 153, 0.063) +} + +.ace-katzenmilch .ace_support.ace_function { + color: #9D7e62; + rbackground-color: rgba(189, 190, 130, 0.039) +} + +.ace-katzenmilch .ace_support.ace_class { + color: rgba(239, 106, 167, 1.0); + rbackground-color: rgba(239, 106, 167, 0.063) +} + +.ace-katzenmilch .ace_storage { + color: rgba(123, 92, 191, 1.0); + rbackground-color: rgba(139, 93, 223, 0.051) +} + +.ace-katzenmilch .ace_invalid { + color: #DFDFD5; + rbackground-color: #CC1B27 +} + +.ace-katzenmilch .ace_string { + color: #5a5f9b; + rbackground-color: rgba(170, 175, 219, 0.035) +} + +.ace-katzenmilch .ace_comment { + font-style: italic; + color: rgba(64, 79, 80, 0.67); + rbackground-color: rgba(95, 15, 255, 0.0078) +} + +.ace-katzenmilch .ace_entity.ace_name.ace_function, +.ace-katzenmilch .ace_variable { + color: rgba(2, 95, 73, 0.97); + rbackground-color: rgba(34, 255, 73, 0.12) +} + +.ace-katzenmilch .ace_variable.ace_language { + color: #316fcf; + rbackground-color: rgba(58, 175, 255, 0.039) +} + +.ace-katzenmilch .ace_variable.ace_parameter { + font-style: italic; + color: rgba(51, 150, 159, 0.87); + rbackground-color: rgba(5, 214, 249, 0.043) +} + +.ace-katzenmilch .ace_entity.ace_other.ace_attribute-name { + color: rgba(73, 70, 194, 0.93); + rbackground-color: rgba(73, 134, 194, 0.035) +} + +.ace-katzenmilch .ace_entity.ace_name.ace_tag { + color: #3976a2; + rbackground-color: rgba(73, 166, 210, 0.039) +} \ No newline at end of file diff --git a/lib/ace/theme/katzenmilch.js b/lib/ace/theme/katzenmilch.js new file mode 100644 index 00000000..4787483d --- /dev/null +++ b/lib/ace/theme/katzenmilch.js @@ -0,0 +1,39 @@ +/* ***** 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 = false; +exports.cssClass = "ace-katzenmilch"; +exports.cssText = require("../requirejs/text!./katzenmilch.css"); + +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); +}); diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index ea030d30..339786ad 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -106,6 +106,11 @@ color: #D1A796 } +.ace-kr-theme .ace_list, +.ace-kr-theme .ace_markup.ace_list { + background-color: #0F0040 +} + .ace-kr-theme .ace_variable.ace_language { color: #FF80E1 } @@ -114,10 +119,6 @@ color: #BABD9C } -.ace-kr-theme .ace_list { - background-color: #0F0040 -} - .ace-kr-theme .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/kuroir.css b/lib/ace/theme/kuroir.css new file mode 100644 index 00000000..fe2ba302 --- /dev/null +++ b/lib/ace/theme/kuroir.css @@ -0,0 +1,68 @@ +/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 467560D0-6ACE-4409-82FD-4791420837AC) */ + +.ace-kuroir .ace_gutter { + background: #e8e8e8; + color: #333; +} + +.ace-kuroir .ace_print-margin { + width: 1px; + background: #e8e8e8; +} + +.ace-kuroir { + background-color: #E8E9E8; + color: #363636; +} + +.ace-kuroir .ace_cursor { + color: #202020; +} + +.ace-kuroir .ace_marker-layer .ace_selection { + background: rgba(245, 170, 0, 0.57); +} + +.ace-kuroir.ace_multiselect .ace_selection.ace_start { + box-shadow: 0 0 3px 0px #E8E9E8; + border-radius: 2px; +} + +.ace-kuroir .ace_marker-layer .ace_step { + background: rgb(198, 219, 174); +} + +.ace-kuroir .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px; + border: 1px solid rgba(0, 0, 0, 0.29); +} + +.ace-kuroir .ace_marker-layer .ace_active-line { + background: rgba(203, 220, 47, 0.22); +} + +.ace-kuroir .ace_gutter-active-line { + background-color: rgba(203, 220, 47, 0.22); +} + +.ace-kuroir .ace_marker-layer .ace_selected-word { + border: 1px solid rgba(245, 170, 0, 0.57); +} + +.ace-kuroir .ace_fold { + background-color: ; + border-color: #363636; +} + + + + + +.ace-kuroir .ace_constant{color:#CD6839;}.ace-kuroir .ace_constant.ace_numeric{color:#9A5925;}.ace-kuroir .ace_support{color:#104E8B;}.ace-kuroir .ace_support.ace_function{color:#005273;}.ace-kuroir .ace_support.ace_constant{color:#CF6A4C;}.ace-kuroir .ace_storage{color:#A52A2A;}.ace-kuroir .ace_invalid.ace_illegal{color:#FD1224; +background-color:rgba(255, 6, 0, 0.15);}.ace-kuroir .ace_invalid.ace_deprecated{text-decoration:underline; +font-style:italic; +color:#FD1732; +background-color:#E8E9E8;}.ace-kuroir .ace_string{color:#639300;}.ace-kuroir .ace_string.ace_regexp{color:#417E00; +background-color:#C9D4BE;}.ace-kuroir .ace_comment{color:rgba(148, 148, 148, 0.91); +background-color:rgba(220, 220, 220, 0.56);}.ace-kuroir .ace_variable{color:#009ACD;}.ace-kuroir .ace_meta.ace_tag{color:#005273;}.ace-kuroir .ace_markup.ace_heading{color:#B8012D; +background-color:rgba(191, 97, 51, 0.051);}.ace-kuroir .ace_markup.ace_list{color:#8F5B26;} \ No newline at end of file diff --git a/lib/ace/theme/kuroir.js b/lib/ace/theme/kuroir.js new file mode 100644 index 00000000..cef6a50b --- /dev/null +++ b/lib/ace/theme/kuroir.js @@ -0,0 +1,39 @@ +/* ***** 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 = false; +exports.cssClass = "ace-kuroir"; +exports.cssText = require("../requirejs/text!./kuroir.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 d0803d82..a84ec3a6 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -106,5 +106,5 @@ } .ace-merbivore .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQFxf3ZXB1df0PAAdsAmERTkEHAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQFxf3ZXB1df0PAAdsAmERTkEHAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index 7792440d..f0ad0bac 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -107,5 +107,5 @@ } .ace-merbivore-soft .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkpLyZfD09PwPAAfYAnaStpHRAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkpLyZfD09PwPAAfYAnaStpHRAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 90531fa2..7e40a3b9 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -122,5 +122,5 @@ } .ace-mono-industrial .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ1NbwZfALD/4PAAlTArlEC4r/AAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ1NbwZfALD/4PAAlTArlEC4r/AAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 77d18fe2..a3a063df 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -118,5 +118,5 @@ } .ace-monokai .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index 9e876d4a..8cab16a1 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -125,5 +125,5 @@ } .ace-pastel-on-dark .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYIiPj/8PAARgAh2NTMh8AAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYIiPj/8PAARgAh2NTMh8AAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 1b55f29f..ea8ec8aa 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -18,7 +18,8 @@ color: #93A1A1 } -.ace-solarized-dark .ace_cursor { +.ace-solarized-dark .ace_cursor, +.ace-solarized-dark .ace_string.ace_regexp { color: #D30102 } @@ -90,15 +91,11 @@ color: #2AA198 } -.ace-solarized-dark .ace_string.ace_regexp { - color: #D30102 -} - .ace-solarized-dark .ace_comment { font-style: italic; color: #657B83 } .ace-solarized-dark .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db1ZVCxc/sPAAd4AlUHlLenAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db1ZVCxc/sPAAd4AlUHlLenAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index c72a8d21..64c4bac9 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -18,7 +18,7 @@ } .ace-solarized-light .ace_marker-layer .ace_selection { - background: rgba(7, 54, 67, 0.09) + background: rgba(7, 54, 67, 0.09) } .ace-solarized-light.ace_multiselect .ace_selection.ace_start { @@ -102,5 +102,5 @@ } .ace-solarized-light .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHjy8NJ/AAjgA5fzQUmBAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHjy8NJ/AAjgA5fzQUmBAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index 3e59b8b5..20975004 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -103,6 +103,7 @@ } .ace-tomorrow .ace_heading, +.ace-tomorrow .ace_markup.ace_heading, .ace-tomorrow .ace_string { color: #718C00 } diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index a8a9111e..aafceab6 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -8,7 +8,7 @@ background: #25282c } -.ace-tomorrow-night { +.ace-tomorrow-night { background-color: #1D1F21; color: #C5C8C6 } @@ -103,6 +103,7 @@ } .ace-tomorrow-night .ace_heading, +.ace-tomorrow-night .ace_markup.ace_heading, .ace-tomorrow-night .ace_string { color: #B5BD68 } @@ -120,5 +121,5 @@ } .ace-tomorrow-night .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index dbdd4e7d..e717be0a 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -13,10 +13,7 @@ color: #FFFFFF } -.ace-tomorrow-night-blue .ace_constant.ace_other { - color: #FFFFFF -} - +.ace-tomorrow-night-blue .ace_constant.ace_other, .ace-tomorrow-night-blue .ace_cursor { color: #FFFFFF } @@ -103,6 +100,7 @@ } .ace-tomorrow-night-blue .ace_heading, +.ace-tomorrow-night-blue .ace_markup.ace_heading, .ace-tomorrow-night-blue .ace_string { color: #D1F1A9 } @@ -120,5 +118,5 @@ } .ace-tomorrow-night-blue .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYJDzqfwPAANXAeNsiA+ZAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYJDzqfwPAANXAeNsiA+ZAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 76c9a760..183e0eaf 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -51,7 +51,7 @@ } .ace-tomorrow-night-bright .ace_stack { - background-color: rgb(66, 90, 44); + background-color: rgb(66, 90, 44) } .ace-tomorrow-night-bright .ace_marker-layer .ace_selected-word { @@ -114,6 +114,7 @@ } .ace-tomorrow-night-bright .ace_heading, +.ace-tomorrow-night-bright .ace_markup.ace_heading, .ace-tomorrow-night-bright .ace_string { color: #B9CA4A } @@ -135,5 +136,5 @@ } .ace-tomorrow-night-bright .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 200044a5..85d7b089 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -13,10 +13,7 @@ color: #CCCCCC } -.ace-tomorrow-night-eighties .ace_constant.ace_other { - color: #CCCCCC -} - +.ace-tomorrow-night-eighties .ace_constant.ace_other, .ace-tomorrow-night-eighties .ace_cursor { color: #CCCCCC } @@ -107,6 +104,7 @@ } .ace-tomorrow-night-eighties .ace_heading, +.ace-tomorrow-night-eighties .ace_markup.ace_heading, .ace-tomorrow-night-eighties .ace_string { color: #99CC99 } diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index fd427a23..0ca694fb 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -61,6 +61,7 @@ .ace-twilight .ace_constant.ace_character.ace_escape, .ace-twilight .ace_constant.ace_other, .ace-twilight .ace_heading, +.ace-twilight .ace_markup.ace_heading, .ace-twilight .ace_support.ace_constant { color: #CF6A4C } @@ -90,6 +91,7 @@ } .ace-twilight .ace_list, +.ace-twilight .ace_markup.ace_list, .ace-twilight .ace_storage { color: #F9EE98 } @@ -122,5 +124,5 @@ } .ace-twilight .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css index dd1edb21..e2901156 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -106,5 +106,5 @@ } .ace-vibrant-ink .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYNDTc/oPAALPAZ7hxlbYAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYNDTc/oPAALPAZ7hxlbYAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css index 56eb9a89..ae58ef21 100644 --- a/lib/ace/theme/xcode.css +++ b/lib/ace/theme/xcode.css @@ -1,3 +1,4 @@ +.ace-xcode .ace_gutter, /* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: EE3AD170-2B7F-4DE1-B724-C75F13FE0085) */ .ace-xcode .ace_gutter { diff --git a/tool/tmtheme.js b/tool/tmtheme.js index 4aa4c402..003748a3 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -157,9 +157,13 @@ function luma(color) { } function parseColor(color) { + if (color.length == 4) + color = color.replace(/[a-fA-F\d]/g, "$&$&"); if (color.length == 7) return color; else { + if (!color.match(/^#(..)(..)(..)(..)$/)) + console.error("can't parse color", color); var rgba = color.match(/^#(..)(..)(..)(..)$/).slice(1).map(function(c) { return parseInt(c, 16); }); @@ -247,6 +251,7 @@ var themes = { "solarized_dark": "Solarized-dark", "solarized_light": "Solarized-light", "katzenmilch": "Katzenmilch", + "kuroir": "Kuroir Theme", //"textmate": "Textmate (Mac Classic)", "tomorrow": "Tomorrow", "tomorrow_night": "Tomorrow-Night", From c563f15e93e5a30533f0ef54504649d30b59f034 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Oct 2013 18:07:25 +0400 Subject: [PATCH 2/2] use ext/themelist.js in kitchen-sink demo --- demo/kitchen-sink/demo.js | 11 +++- demo/kitchen-sink/util.js | 2 +- kitchen-sink.html | 35 +------------ lib/ace/ext/themelist.js | 74 +++++++++++++++++---------- lib/ace/ext/themelist_utils/themes.js | 36 ------------- 5 files changed, 59 insertions(+), 99 deletions(-) delete mode 100644 lib/ace/ext/themelist_utils/themes.js diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js index 3a1c6d63..9880d33e 100644 --- a/demo/kitchen-sink/demo.js +++ b/demo/kitchen-sink/demo.js @@ -65,6 +65,7 @@ var whitespace = require("ace/ext/whitespace"); var doclist = require("./doclist"); var modelist = require("ace/ext/modelist"); +var themelist = require("ace/ext/themelist"); var layout = require("./layout"); var TokenTooltip = require("./token_tooltip").TokenTooltip; var util = require("./util"); @@ -370,6 +371,12 @@ function updateUIEditorOptions() { saveOption(behavioursEl, editor.getBehavioursEnabled()); } +themelist.themes.forEach(function(x){ x.value = x.theme }); +fillDropdown(themeEl, { + Bright: themelist.themes.filter(function(x){return !x.isDark}), + Dark: themelist.themes.filter(function(x){return x.isDark}), +}); + event.addListener(themeEl, "mouseover", function(e){ themeEl.desiredValue = e.target.value; if (!themeEl.$timer) @@ -383,7 +390,7 @@ event.addListener(themeEl, "mouseout", function(e){ }); themeEl.updateTheme = function(){ - env.split.setTheme(themeEl.desiredValue || themeEl.selectedValue); + env.split.setTheme((themeEl.desiredValue || themeEl.selectedValue)); themeEl.$timer = null; }; @@ -588,4 +595,4 @@ env.editor.setOptions({ enableSnippets: true }); -}); \ No newline at end of file +}); diff --git a/demo/kitchen-sink/util.js b/demo/kitchen-sink/util.js index 3b00c1ce..c4b74f38 100644 --- a/demo/kitchen-sink/util.js +++ b/demo/kitchen-sink/util.js @@ -218,7 +218,7 @@ function optgroup(values) { return values.map(function(item) { if (typeof item == "string") item = {name: item, caption: item}; - return elt("option", {value: item.name}, item.caption || item.desc); + return elt("option", {value: item.value || item.name}, item.caption || item.desc); }); } diff --git a/kitchen-sink.html b/kitchen-sink.html index 2c5c518b..c149c484 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -63,40 +63,7 @@ diff --git a/lib/ace/ext/themelist.js b/lib/ace/ext/themelist.js index 1032f72c..420a5d6e 100644 --- a/lib/ace/ext/themelist.js +++ b/lib/ace/ext/themelist.js @@ -44,35 +44,57 @@ define(function(require, exports, module) { "use strict"; +var themeData = [ + ["Chrome" ], + ["Clouds" ], + ["Crimson Editor" ], + ["Dawn" ], + ["Dreamweaver" ], + ["Eclipse" ], + ["GitHub" ], + ["Solarized Light"], + ["TextMate" ], + ["Tomorrow" ], + ["XCode" ], + ["Kuroir"], + ["KatzenMilch"], + ["Ambiance" ,"ambiance" , "dark"], + ["Chaos" ,"chaos" , "dark"], + ["Clouds Midnight" ,"clouds_midnight" , "dark"], + ["Cobalt" ,"cobalt" , "dark"], + ["idle Fingers" ,"idle_fingers" , "dark"], + ["krTheme" ,"kr_theme" , "dark"], + ["Merbivore" ,"merbivore" , "dark"], + ["Merbivore Soft" ,"merbivore_soft" , "dark"], + ["Mono Industrial" ,"mono_industrial" , "dark"], + ["Monokai" ,"monokai" , "dark"], + ["Pastel on dark" ,"pastel_on_dark" , "dark"], + ["Solarized Dark" ,"solarized_dark" , "dark"], + ["Terminal" ,"terminal" , "dark"], + ["Tomorrow Night" ,"tomorrow_night" , "dark"], + ["Tomorrow Night Blue" ,"tomorrow_night_blue" , "dark"], + ["Tomorrow Night Bright","tomorrow_night_bright" , "dark"], + ["Tomorrow Night 80s" ,"tomorrow_night_eighties" , "dark"], + ["Twilight" ,"twilight" , "dark"], + ["Vibrant Ink" ,"vibrant_ink" , "dark"], +] + + +exports.themesByName = {}; + /** * An array containing information about available themes. */ -module.exports.themes = require('ace/ext/themelist_utils/themes').themes; - -/** - * Creates a theme description. - * @param {string} name The file name of the theme. - * @returns {ThemeDescription} Returns a theme description object which has - * three properties: the name gives the filename, the desc gives a menu - * friendly name, and the theme gives the string to set the theme with - * `setTheme` - */ -module.exports.ThemeDescription = function(name) { - this.name = name; - this.desc = name.split('_' - ).map( - function(namePart) { - return namePart[0].toUpperCase() + namePart.slice(1); - } - ).join(' '); - this.theme = "ace/theme/" + name; -}; - -module.exports.themesByName = {}; - -module.exports.themes = module.exports.themes.map(function(name) { - module.exports.themesByName[name] = new module.exports.ThemeDescription(name); - return module.exports.themesByName[name]; +exports.themes = themeData.map(function(data) { + var name = data[1] || data[0].replace(/ /g, "_").toLowerCase(); + var theme = { + caption: data[0], + theme: "ace/theme/" + name, + isDark: data[2] == "dark", + name: name + }; + exports.themesByName[name] = theme; + return theme; }); }); diff --git a/lib/ace/ext/themelist_utils/themes.js b/lib/ace/ext/themelist_utils/themes.js deleted file mode 100644 index 2e490c9f..00000000 --- a/lib/ace/ext/themelist_utils/themes.js +++ /dev/null @@ -1,36 +0,0 @@ -define(function(require, exports, module) { - -module.exports.themes = [ - "ambiance", - "chaos", - "chrome", - "clouds", - "clouds_midnight", - "cobalt", - "crimson_editor", - "dawn", - "dreamweaver", - "eclipse", - "github", - "idle_fingers", - "kr_theme", - "merbivore", - "merbivore_soft", - "mono_industrial", - "monokai", - "pastel_on_dark", - "solarized_dark", - "solarized_light", - "terminal", - "textmate", - "tomorrow", - "tomorrow_night", - "tomorrow_night_blue", - "tomorrow_night_bright", - "tomorrow_night_eighties", - "twilight", - "vibrant_ink", - "xcode" -]; - -}); \ No newline at end of file