diff --git a/kitchen-sink.html b/kitchen-sink.html index 825a6194..67abbe4f 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -70,6 +70,7 @@ + diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index 7c0ed3bd..02e79375 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -1,169 +1,146 @@ +/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 4FCFA210-B247-11D9-9D00-000D93347A42) */ + .ace-chrome .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-chrome .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-chrome .ace_gutter { background: #ebebeb; color: #333; - overflow : hidden; + overflow : hidden } .ace-chrome .ace_print_margin { width: 1px; - background: #e8e8e8; + background: #e8e8e8 } .ace-chrome .ace_scroller { - background-color: #FFFFFF; + background-color: #FFFFFF +} + +.ace-chrome .ace_text-layer { + color: #000000 } .ace-chrome .ace_cursor { - border-left: 2px solid black; + border-left: 2px solid #000000 } .ace-chrome .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid black; -} - -.ace-chrome .ace_line .ace_invisible { - color: rgb(191, 191, 191); -} - -.ace-chrome .ace_line .ace_constant.ace_buildin { - color: rgb(88, 72, 246); -} - -.ace-chrome .ace_line .ace_constant.ace_language { - color: rgb(88, 92, 246); -} - -.ace-chrome .ace_line .ace_constant.ace_library { - color: rgb(6, 150, 14); -} - -.ace-chrome .ace_line .ace_invalid { - background-color: rgb(153, 0, 0); - color: white; -} - -.ace-chrome .ace_line .ace_fold { -} - -.ace-chrome .ace_line .ace_support.ace_function { - color: rgb(60, 76, 114); -} - -.ace-chrome .ace_line .ace_support.ace_constant { - color: rgb(6, 150, 14); -} - -.ace-chrome .ace_line .ace_support.ace_type, -.ace-chrome .ace_line .ace_support.ace_class -.ace-chrome .ace_line .ace_support.ace_other, { - color: rgb(109, 121, 222); -} - -.ace-chrome .ace_variable.ace_parameter { - font-style:italic; - color:#FD971F; -} -.ace-chrome .ace_line .ace_keyword.ace_operator { - color: rgb(104, 118, 135); -} - -.ace-chrome .ace_line .ace_comment { - color: #236e24; -} - -.ace-chrome .ace_line .ace_comment.ace_doc { - color: #236e24; -} - -.ace-chrome .ace_line .ace_comment.ace_doc.ace_tag { - color: #236e24; -} - -.ace-chrome .ace_line .ace_constant.ace_numeric { - color: rgb(0, 0, 205); -} - -.ace-chrome .ace_line .ace_variable { - color: rgb(49, 132, 149); -} - -.ace-chrome .ace_line .ace_xml_pe { - color: rgb(104, 104, 91); -} - -.ace-chrome .ace_entity.ace_name.ace_function { - color: #0000A2; -} - -.ace-chrome .ace_markup.ace_underline { - text-decoration:underline; -} - -.ace-chrome .ace_markup.ace_heading { - color: rgb(12, 7, 255); -} - -.ace-chrome .ace_markup.ace_list { - color:rgb(185, 6, 144); + border-bottom: 1px solid #000000 } .ace-chrome .ace_marker-layer .ace_selection { - background: rgb(181, 213, 255); + background: #BAD6FD +} + +.ace-chrome.multiselect .ace_selection.start { + box-shadow: 0 0 3px 0px #FFFFFF; + border-radius: 2px } .ace-chrome .ace_marker-layer .ace_step { - background: rgb(252, 255, 0); -} - -.ace-chrome .ace_marker-layer .ace_stack { - background: rgb(164, 229, 101); + background: rgb(198, 219, 174) } .ace-chrome .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgb(192, 192, 192); + border: 1px solid rgba(179, 179, 179, 0.96) } .ace-chrome .ace_marker-layer .ace_active_line { - background: rgba(0, 0, 0, 0.07); + background: rgba(0, 0, 0, 0.10) } .ace-chrome .ace_gutter_active_line { - background-color : #dcdcdc; + background-color: rgba(0, 0, 0, 0.10) } .ace-chrome .ace_marker-layer .ace_selected_word { - background: rgb(250, 250, 255); - border: 1px solid rgb(200, 200, 250); + border: 1px solid #BAD6FD +} + +.ace-chrome .ace_invisible { + color: rgba(179, 179, 179, 0.96) +} + +.ace-chrome .ace_keyword, +.ace-chrome .ace_meta { + color: #AA0D91 +} + +.ace-chrome .ace_keyword.ace_operator { + color: #000000 +} + +.ace-chrome .ace_constant.ace_language { + color: #AA0D91 +} + +.ace-chrome .ace_constant.ace_numeric { + color: #1C00CF +} + +.ace-chrome .ace_invalid { + color: #FF0000 +} + + +.ace-chrome .ace_support { + color: #000000 +} + +.ace-chrome .ace_line .ace_fold { + +} + +.ace-chrome .ace_storage { + color: #AA0D91 +} + +.ace-chrome .ace_variable { + color: #000000 +} + +.ace-chrome .ace_variable.ace_parameter { + font-style: italic +} + +.ace-chrome .ace_string { + color: #C41A16 +} + +.ace-chrome .ace_comment { + color: #007400 } -.ace-chrome .ace_storage, -.ace-chrome .ace_line .ace_keyword, .ace-chrome .ace_meta.ace_tag { - color: rgb(147, 15, 128); -} - -.ace-chrome .ace_string.ace_regex { - color: rgb(255, 0, 0) -} - -.ace-chrome .ace_line .ace_string { - color: #1A1AA6; + color: #AA0D91 } .ace-chrome .ace_entity.ace_other.ace_attribute-name { - color: #994409; + font-style: italic; + color: #994500 +} + +.ace-chrome .ace_entity.ace_name.ace_function { + color: #000000 +} + +.ace-chrome .ace_entity.ace_name.ace_tag { + color: #881280 +} + +.ace-chrome .ace_markup.ace_underline { + text-decoration: underline } .ace-chrome .ace_indent-guide { - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y; -} + 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/clouds.css b/lib/ace/theme/clouds.css index 3f33a7d7..00ca65c9 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -1,124 +1,161 @@ .ace-clouds .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-clouds .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-clouds .ace_gutter { background: #ebebeb; - color: #333; + color: #333 } .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 { 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 { 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; + background: #FFFBD1 } .ace-clouds .ace_gutter_active_line { - background-color : #dcdcdc; + background-color : #dcdcdc } .ace-clouds .ace_marker-layer .ace_selected_word { - border: 1px solid #BDD5FC; + 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 { + 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_character.ace_entity { + color: #BF78CC } .ace-clouds .ace_constant.ace_language { - color:#39946A; + color: #39946A } .ace-clouds .ace_constant.ace_numeric { - color:#46A609; + color: #46A609 +} + +.ace-clouds .ace_constant.ace_other.ace_color { + color: #AF956F } .ace-clouds .ace_invalid { - background-color:#FF002A; + background-color: #FF002A +} + +.ace-clouds support.constant.property-value { + color: #BF78CC } .ace-clouds .ace_fold { - background-color: #AF956F; - border-color: #000000; + background-color: #AF956F; + border-color: #000000 +} + +.ace-clouds .ace_support.ace_function { + color: #C52727 } .ace-clouds .ace_support.ace_function, .ace-clouds .ace_support.ace_class, .ace-clouds .ace_support.ace_type, .ace-clouds .ace_support.ace_other { - color:#C52727; + color: #C52727 } .ace-clouds .ace_storage { - color:#C52727; + color: #C52727 } .ace-clouds .ace_string { - color:#5D90CD; + color: #5D90CD +} + +.ace-clouds .ace_meta.ace_selector { + color: #C52727 +} + +.ace-clouds .ace_variable.ace_language { + color: #39946A +} + +.ace-clouds .ace_entity.ace_other.ace_inherited-class { + color: #858585 +} + +.ace-clouds .ace_entity.ace_name.ace_tag { + color: #606060 } .ace-clouds .ace_comment { - color:#BCC8BA; + color: #BCC8BA } .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; + 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/clouds.js b/lib/ace/theme/clouds.js index 05e8e719..13d66603 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -34,6 +34,6 @@ exports.isDark = false; exports.cssClass = "ace-clouds"; exports.cssText = require('ace/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); }); diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index ba8abd68..0e3df808 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -1,126 +1,146 @@ - .ace-clouds-midnight .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-clouds-midnight .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-clouds-midnight .ace_gutter { background: #232323; - color: #929292; + color: #929292 } .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 { 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 { 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); + background: rgba(215, 215, 215, 0.031) } .ace-clouds-midnight .ace_gutter_active_line { - background-color: rgba(215, 215, 215, 0.031); + background-color: rgba(215, 215, 215, 0.031) } .ace-clouds-midnight .ace_marker-layer .ace_selected_word { - border: 1px solid #000000; + 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 { + 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_character.ace_entity { + color: #A165AC } .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; + color: #FFFFFF; + background-color: #E92E2E +} + +.ace-clouds-midnight support.constant.property-value { + color: #927C5D } .ace-clouds-midnight .ace_fold { - background-color: #927C5D; - border-color: #929292; + background-color: #927C5D; + border-color: #929292 +} + +.ace-clouds-midnight .ace_support.ace_function { + color: #E92E2E } .ace-clouds-midnight .ace_support.ace_function, .ace-clouds-midnight .ace_support.ace_class, .ace-clouds-midnight .ace_support.ace_type, .ace-clouds-midnight .ace_support.ace_other { - color:#E92E2E; + color: #E92E2E } .ace-clouds-midnight .ace_storage { - color:#E92E2E; + 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 { + color: #606060 } .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; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQlJT8z1BeXv4fAA2KA6+h9Z+2AAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js index df434043..9359d120 100644 --- a/lib/ace/theme/clouds_midnight.js +++ b/lib/ace/theme/clouds_midnight.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-clouds-midnight"; exports.cssText = require('ace/requirejs/text!./clouds_midnight.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index f20de018..d074dee5 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -1,147 +1,152 @@ .ace-cobalt .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-cobalt .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-cobalt .ace_gutter { background: #011e3a; - color: #fff; + color: #fff } .ace-cobalt .ace_print_margin { width: 1px; - background: #011e3a; + background: #011e3a } .ace-cobalt .ace_scroller { - background-color: #002240; + background-color: #002240 } .ace-cobalt .ace_text-layer { - color: #FFFFFF; + color: #FFFFFF } .ace-cobalt .ace_cursor { - border-left: 2px solid #FFFFFF; + border-left: 2px solid #FFFFFF } .ace-cobalt .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF } .ace-cobalt .ace_marker-layer .ace_selection { - background: rgba(179, 101, 57, 0.75); + background: rgba(179, 101, 57, 0.75) } .ace-cobalt.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #002240; - border-radius: 2px; + border-radius: 2px } .ace-cobalt .ace_marker-layer .ace_step { - background: rgb(127, 111, 19); + background: rgb(127, 111, 19) } .ace-cobalt .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(255, 255, 255, 0.15); + border: 1px solid rgba(255, 255, 255, 0.15) } .ace-cobalt .ace_marker-layer .ace_active_line { - background: rgba(0, 0, 0, 0.35); + background: rgba(0, 0, 0, 0.35) } .ace-cobalt .ace_gutter_active_line { - background-color: rgba(0, 0, 0, 0.35); + background-color: rgba(0, 0, 0, 0.35) } .ace-cobalt .ace_marker-layer .ace_selected_word { - border: 1px solid rgba(179, 101, 57, 0.75); + border: 1px solid rgba(179, 101, 57, 0.75) } .ace-cobalt .ace_invisible { - color: rgba(255, 255, 255, 0.15); + color: rgba(255, 255, 255, 0.15) } -.ace-cobalt .ace_keyword, .ace-cobalt .ace_meta { - color:#FF9D00; +.ace-cobalt .ace_keyword, +.ace-cobalt .ace_meta { + color: #FF9D00 } -.ace-cobalt .ace_constant, .ace-cobalt .ace_constant.ace_other { - color:#FF628C; +.ace-cobalt .ace_constant, +.ace-cobalt .ace_constant.ace_other { + color: #FF628C } -.ace-cobalt .ace_constant.ace_character, { - color:#FF628C; +.ace-cobalt .ace_constant.ace_character, + { + color: #FF628C } -.ace-cobalt .ace_constant.ace_character.ace_escape, { - color:#FF628C; +.ace-cobalt .ace_constant.ace_character.ace_escape, + { + color: #FF628C } .ace-cobalt .ace_invalid { - color:#F8F8F8; -background-color:#800F00; + color: #F8F8F8; + background-color: #800F00 } .ace-cobalt .ace_support { - color:#80FFBB; + color: #80FFBB } .ace-cobalt .ace_support.ace_constant { - color:#EB939A; + color: #EB939A } .ace-cobalt .ace_fold { - background-color: #FF9D00; - border-color: #FFFFFF; + background-color: #FF9D00; + border-color: #FFFFFF } .ace-cobalt .ace_support.ace_function { - color:#FFB054; + color: #FFB054 } .ace-cobalt .ace_storage { - color:#FFEE80; + color: #FFEE80 } .ace-cobalt .ace_string.ace_regexp { - color:#80FFC2; + color: #80FFC2 } .ace-cobalt .ace_comment { - font-style:italic; -color:#0088FF; + font-style: italic; + color: #0088FF } .ace-cobalt .ace_variable { - color:#CCCCCC; + color: #CCCCCC } .ace-cobalt .ace_variable.ace_language { - color:#FF80E1; + color: #FF80E1 } .ace-cobalt .ace_meta.ace_tag { - color:#9EFFFF; + color: #9EFFFF } .ace-cobalt .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-cobalt .ace_markup.ace_heading { - color:#C8E4FD; -background-color:#001221; + color: #C8E4FD; + background-color: #001221 } .ace-cobalt .ace_markup.ace_list { - background-color:#130D26; + background-color: #130D26 } + .ace-cobalt .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgUHL4zzBz5sz/AA80BCzv+WXhAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgUHL4zzBz5sz/AA80BCzv+WXhAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index de0bfff7..0964e9a6 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-cobalt"; exports.cssText = require('ace/requirejs/text!./cobalt.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index d26edebf..8b531adb 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -1,153 +1,156 @@ - .ace-dawn .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-dawn .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-dawn .ace_gutter { background: #ebebeb; - color: #333; + color: #333 } .ace-dawn .ace_print_margin { width: 1px; - background: #e8e8e8; + background: #e8e8e8 } .ace-dawn .ace_scroller { - background-color: #F9F9F9; + background-color: #F9F9F9 } .ace-dawn .ace_text-layer { - color: #080808; + color: #080808 } .ace-dawn .ace_cursor { - border-left: 2px solid #000000; + border-left: 2px solid #000000 } .ace-dawn .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #000000; + border-bottom: 1px solid #000000 } .ace-dawn .ace_marker-layer .ace_selection { - background: rgba(39, 95, 255, 0.30); + background: rgba(39, 95, 255, 0.30) } .ace-dawn.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #F9F9F9; - border-radius: 2px; + border-radius: 2px } .ace-dawn .ace_marker-layer .ace_step { - background: rgb(255, 255, 0); + background: rgb(255, 255, 0) } .ace-dawn .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(75, 75, 126, 0.50); + border: 1px solid rgba(75, 75, 126, 0.50) } .ace-dawn .ace_marker-layer .ace_active_line { - background: rgba(36, 99, 180, 0.12); + background: rgba(36, 99, 180, 0.12) } .ace-dawn .ace_gutter_active_line { - background-color : #dcdcdc; + background-color : #dcdcdc } .ace-dawn .ace_marker-layer .ace_selected_word { - border: 1px solid rgba(39, 95, 255, 0.30); + border: 1px solid rgba(39, 95, 255, 0.30) } .ace-dawn .ace_invisible { - color: rgba(75, 75, 126, 0.50); + color: rgba(75, 75, 126, 0.50) } -.ace-dawn .ace_keyword, .ace-dawn .ace_meta { - color:#794938; +.ace-dawn .ace_keyword, +.ace-dawn .ace_meta { + color: #794938 } -.ace-dawn .ace_constant, .ace-dawn .ace_constant.ace_other { - color:#811F24; +.ace-dawn .ace_constant, +.ace-dawn .ace_constant.ace_other { + color: #811F24 } -.ace-dawn .ace_constant.ace_character, { - color:#811F24; +.ace-dawn .ace_constant.ace_character, + { + color: #811F24 } -.ace-dawn .ace_constant.ace_character.ace_escape, { - color:#811F24; +.ace-dawn .ace_constant.ace_character.ace_escape, + { + color: #811F24 } .ace-dawn .ace_invalid.ace_illegal { - text-decoration:underline; -font-style:italic; -color:#F8F8F8; -background-color:#B52A1D; + text-decoration: underline; + font-style: italic; + color: #F8F8F8; + background-color: #B52A1D } .ace-dawn .ace_invalid.ace_deprecated { - text-decoration:underline; -font-style:italic; -color:#B52A1D; + text-decoration: underline; + font-style: italic; + color: #B52A1D } .ace-dawn .ace_support { - color:#691C97; + color: #691C97 } .ace-dawn .ace_support.ace_constant { - color:#B4371F; + color: #B4371F } .ace-dawn .ace_fold { - background-color: #794938; - border-color: #080808; + background-color: #794938; + border-color: #080808 } .ace-dawn .ace_support.ace_function { - color:#693A17; + color: #693A17 } .ace-dawn .ace_storage { - font-style:italic; -color:#A71D5D; + font-style: italic; + color: #A71D5D } .ace-dawn .ace_string { - color:#0B6125; + color: #0B6125 } .ace-dawn .ace_string.ace_regexp { - color:#CF5628; + color: #CF5628 } .ace-dawn .ace_comment { - font-style:italic; -color:#5A525F; + font-style: italic; + color: #5A525F } .ace-dawn .ace_variable { - color:#234A97; + color: #234A97 } .ace-dawn .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-dawn .ace_markup.ace_heading { - color:#19356D; + color: #19356D } .ace-dawn .ace_markup.ace_list { - color:#693A17; + color: #693A17 } .ace-dawn .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4+fPnf4ZVq1b9BwAkVQboFQv98gAAAABJRU5ErkJggg==) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4+fPnf4ZVq1b9BwAkVQboFQv98gAAAABJRU5ErkJggg==) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index 4e85d1e9..88b5ae38 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -34,6 +34,6 @@ exports.isDark = false; exports.cssClass = "ace-dawn"; exports.cssText = require('ace/requirejs/text!./dawn.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css index ab845390..c2433588 100644 --- a/lib/ace/theme/dreamweaver.css +++ b/lib/ace/theme/dreamweaver.css @@ -1,106 +1,133 @@ .ace-dreamweaver .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-dreamweaver .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-dreamweaver .ace_gutter { background: #e8e8e8; - color: #333; + color: #333 } .ace-dreamweaver .ace_print_margin { width: 1px; - background: #e8e8e8; + background: #e8e8e8 } .ace-dreamweaver .ace_scroller { - background-color: #FFFFFF; + background-color: #FFFFFF } .ace-dreamweaver .ace_fold { - background-color: #757AD8; + background-color: #757AD8 } .ace-dreamweaver .ace_text-layer { + } .ace-dreamweaver .ace_cursor { - border-left: 2px solid black; + border-left: 2px solid black } .ace-dreamweaver .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid black; + border-bottom: 1px solid black } - + +.ace-dreamweaver.multiselect .ace_selection.start { + box-shadow: 0 0 3px 0px #FFFFFF; + border-radius: 2px +} + .ace-dreamweaver .ace_line .ace_invisible { - color: rgb(191, 191, 191); + color: rgb(191, 191, 191) } .ace-dreamweaver .ace_line .ace_storage, .ace-dreamweaver .ace_line .ace_keyword { - color: blue; + color: blue } .ace-dreamweaver .ace_line .ace_constant.ace_buildin { - color: rgb(88, 72, 246); + color: rgb(88, 72, 246) +} + +.ace-dreamweaver .ace_gutter_active_line { + background-color: rgba(0, 0, 0, 0.071) } .ace-dreamweaver .ace_line .ace_constant.ace_language { - color: rgb(88, 92, 246); + color: rgb(88, 92, 246) +} + +.ace-dreamweaver .ace_invisible { + color: #BFBFBF +} + +.ace-dreamweaver .ace_invalid { + color: #EE000B; + background-color: #EFFF8A } .ace-dreamweaver .ace_line .ace_constant.ace_library { - color: rgb(6, 150, 14); + color: rgb(6, 150, 14) +} + +.ace-dreamweaver .ace_comment { + color: #9A9A9A +} + +.ace-dreamweaver .ace_comment { + color: #9A9A9A } .ace-dreamweaver .ace_line .ace_invalid { background-color: rgb(153, 0, 0); - color: white; + color: white } .ace-dreamweaver .ace_line .ace_support.ace_function { - color: rgb(60, 76, 114); + color: rgb(60, 76, 114) } .ace-dreamweaver .ace_line .ace_support.ace_constant { - color: rgb(6, 150, 14); + color: rgb(6, 150, 14) } .ace-dreamweaver .ace_line .ace_support.ace_type, .ace-dreamweaver .ace_line .ace_support.ace_class { - color: #009; + color: #009 } .ace-dreamweaver .ace_line .ace_support.ace_php_tag { - color: #f00; + color: #f00 } .ace-dreamweaver .ace_line .ace_keyword.ace_operator { - color: rgb(104, 118, 135); + color: rgb(104, 118, 135) } .ace-dreamweaver .ace_line .ace_string { - color: #00F; + color: #00F } .ace-dreamweaver .ace_line .ace_comment { - color: rgb(76, 136, 107); + color: rgb(76, 136, 107) } .ace-dreamweaver .ace_line .ace_comment.ace_doc { - color: rgb(0, 102, 255); + color: rgb(0, 102, 255) } .ace-dreamweaver .ace_line .ace_comment.ace_doc.ace_tag { - color: rgb(128, 159, 191); + color: rgb(128, 159, 191) } .ace-dreamweaver .ace_line .ace_constant.ace_numeric { - color: rgb(0, 0, 205); + color: rgb(0, 0, 205) } .ace-dreamweaver .ace_line .ace_variable { @@ -108,77 +135,77 @@ } .ace-dreamweaver .ace_line .ace_xml_pe { - color: rgb(104, 104, 91); + color: rgb(104, 104, 91) } .ace-dreamweaver .ace_entity.ace_name.ace_function { - color: #00F; + color: #00F } .ace-dreamweaver .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-dreamweaver .ace_markup.ace_heading { - color: rgb(12, 7, 255); + color: rgb(12, 7, 255) } .ace-dreamweaver .ace_markup.ace_list { - color:rgb(185, 6, 144); + color: rgb(185, 6, 144) } .ace-dreamweaver .ace_marker-layer .ace_selection { - background: rgb(181, 213, 255); + background: rgb(181, 213, 255) } .ace-dreamweaver .ace_marker-layer .ace_step { - background: rgb(252, 255, 0); + background: rgb(252, 255, 0) } .ace-dreamweaver .ace_marker-layer .ace_stack { - background: rgb(164, 229, 101); + background: rgb(164, 229, 101) } .ace-dreamweaver .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgb(192, 192, 192); + border: 1px solid rgb(192, 192, 192) } .ace-dreamweaver .ace_marker-layer .ace_active_line { - background: rgba(0, 0, 0, 0.07); + background: rgba(0, 0, 0, 0.07) } .ace-dreamweaver .ace_marker-layer .ace_selected_word { background: rgb(250, 250, 255); - border: 1px solid rgb(200, 200, 250); + border: 1px solid rgb(200, 200, 250) } .ace-dreamweaver .ace_meta.ace_tag { - color:#009; + color: #009 } .ace-dreamweaver .ace_meta.ace_tag.ace_anchor { - color:#060; + color: #060 } .ace-dreamweaver .ace_meta.ace_tag.ace_form { - color:#F90; + color: #F90 } .ace-dreamweaver .ace_meta.ace_tag.ace_image { - color:#909; + color: #909 } .ace-dreamweaver .ace_meta.ace_tag.ace_script { - color:#900; + color: #900 } .ace-dreamweaver .ace_meta.ace_tag.ace_style { - color:#909; + color: #909 } .ace-dreamweaver .ace_meta.ace_tag.ace_table { - color:#099; + color: #099 } .ace-dreamweaver .ace_string.ace_regex { @@ -186,5 +213,5 @@ } .ace-dreamweaver .ace_indent-guide { - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y; + 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/dreamweaver.js b/lib/ace/theme/dreamweaver.js index 25a7fcba..81531e47 100644 --- a/lib/ace/theme/dreamweaver.js +++ b/lib/ace/theme/dreamweaver.js @@ -29,6 +29,7 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = false; exports.cssClass = "ace-dreamweaver"; exports.cssText = require('ace/requirejs/text!./dreamweaver.css'); diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css index 6233b427..d8308825 100644 --- a/lib/ace/theme/github.css +++ b/lib/ace/theme/github.css @@ -3,135 +3,216 @@ .ace-github .ace_editor { color: #333; background-color: #F8F8F8; - border: 1px solid #CCC; + border: 2px solid rgb(159, 159, 159); font: 13px 'Bitstream Vera Sans Mono', Courier, monospace !important; line-height: 19px !important; overflow: auto; padding: 6px 10px; border-radius: 3px; position: relative; - margin-bottom: 15px; + margin-bottom: 15px +} + +.ace-github .ace_editor.ace_focus { + border: 2px solid #327fbd } .ace-github .ace_gutter { background: #e8e8e8; - color: #AAA; + color: #AAA } .ace-github .ace_scroller { - background: #fff; + background: #fff } .ace-github .ace_keyword { - font-weight: bold; + font-weight: bold } .ace-github .ace_string { - color: #D14; + color: #D14 } .ace-github .ace_variable.ace_class { - color: teal; + color: teal } .ace-github .ace_constant.ace_numeric { - color: #099; + color: #099 } .ace-github .ace_constant.ace_buildin { - color: #0086B3; + color: #0086B3 } .ace-github .ace_support.ace_function { - color: #0086B3; + color: #0086B3 } .ace-github .ace_comment { color: #998; - font-style: italic; + font-style: italic } -.ace-github .ace_variable.ace_language { - color: #0086B3; +.ace-github .ace_variable.ace_language { + color: #0086B3 } .ace-github .ace_paren { - font-weight: bold; + font-weight: bold } .ace-github .ace_boolean { - font-weight: bold; + font-weight: bold +} + +.ace-github .ace_invisible { + color: #BBBBBB +} + +.ace-github .ace_constant.ace_character { + color: #DD1144 +} + +.ace-github .ace_constant.ace_character.ace_entity { + color: #800080 } .ace-github .ace_string.ace_regexp { color: #009926; - font-weight: normal; + font-weight: normal +} + +.ace-github .ace_constant.ace_other { + color: #009999 +} + +.ace-github .ace_invalid.ace_illegal { + color: #A61717; + background-color: #E3D2D2 +} + +.ace-github .ace_fold { } .ace-github .ace_variable.ace_instancce { - color: teal; + color: teal +} + +.ace-github .ace_support.ace_type { + color: #445588 +} + +.ace-github .ace_support.ace_class { + color: #445588 +} + +.ace-github .ace_storage.ace_type, +.ace-github .ace_support.ace_type { + color: #445588 +} + +.ace-github .ace_variable { + color: #990000 +} + +.ace-github .ace_variable.ace_parameter { + color: #008080 } .ace-github .ace_constant.ace_language { - font-weight: bold; + font-weight: bold } .ace-github .ace_text-layer { + +} + +.ace-github .ace_comment.ace_doc { + font-style: italic; + color: #999999 } .ace-github .ace_cursor { - border-left: 2px solid black; + border-left: 2px solid black +} + +.ace-github .ace_entity.ace_other.ace_attribute-name { + color: #008080 +} + +.ace-github .ace_entity.ace_name.ace_function { + color: #990000 +} + +.ace-github .ace_entity.ace_name.ace_tag { + color: #000080 +} + +.ace-github .ace_markup.ace_underline { + text-decoration: underline +} + +.ace-github .ace_markup.ace_heading { + color: #AAAAAA +} + +.ace-github .ace_markup.ace_heading.ace_1 { + color: #999999 } .ace-github .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid black; + border-bottom: 1px solid black } .ace-github .ace_marker-layer .ace_active_line { - background: rgb(255, 255, 204); + background: rgb(255, 255, 204) } + .ace-github .ace_marker-layer .ace_selection { - background: rgb(181, 213, 255); + background: rgb(181, 213, 255) } + .ace-github.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px white; - border-radius: 2px; + border-radius: 2px } + /* bold keywords cause cursor issues for some fonts */ /* this disables bold style for editor and keeps for static highlighter */ .ace-github.ace_editor .ace_line > span { - font-weight: normal !important; + font-weight: normal !important } .ace-github .ace_marker-layer .ace_step { - background: rgb(252, 255, 0); + background: rgb(252, 255, 0) } .ace-github .ace_marker-layer .ace_stack { - background: rgb(164, 229, 101); + background: rgb(164, 229, 101) } .ace-github .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgb(192, 192, 192); + border: 1px solid rgb(192, 192, 192) } .ace-github .ace_gutter_active_line { - background-color : rgba(0, 0, 0, 0.07); + background-color : rgba(0, 0, 0, 0.07) } .ace-github .ace_marker-layer .ace_selected_word { background: rgb(250, 250, 255); - border: 1px solid rgb(200, 200, 250); - + border: 1px solid rgb(200, 200, 250) } .ace-github .ace_print_margin { width: 1px; - background: #e8e8e8; + background: #e8e8e8 } .ace-github .ace_indent-guide { - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y; + 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/github.js b/lib/ace/theme/github.js index b5839dd4..4af7b944 100644 --- a/lib/ace/theme/github.js +++ b/lib/ace/theme/github.js @@ -34,6 +34,6 @@ exports.isDark = false; exports.cssClass = "ace-github"; exports.cssText = require('ace/requirejs/text!./github.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index 00e8a81e..7ac6a464 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -1,141 +1,144 @@ - .ace-idle-fingers .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-idle-fingers .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-idle-fingers .ace_gutter { background: #3b3b3b; - color: #fff; + color: #fff } .ace-idle-fingers .ace_print_margin { width: 1px; - background: #3b3b3b; + background: #3b3b3b } .ace-idle-fingers .ace_scroller { - background-color: #323232; + background-color: #323232 } .ace-idle-fingers .ace_text-layer { - color: #FFFFFF; + color: #FFFFFF } .ace-idle-fingers .ace_cursor { - border-left: 2px solid #91FF00; + border-left: 2px solid #91FF00 } .ace-idle-fingers .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #91FF00; + border-bottom: 1px solid #91FF00 } .ace-idle-fingers .ace_marker-layer .ace_selection { - background: rgba(90, 100, 126, 0.88); + background: rgba(90, 100, 126, 0.88) } .ace-idle-fingers.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #323232; - border-radius: 2px; + border-radius: 2px } .ace-idle-fingers .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-idle-fingers .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #404040; + border: 1px solid #404040 } .ace-idle-fingers .ace_marker-layer .ace_active_line { - background: #353637; + background: #353637 } .ace-idle-fingers .ace_gutter_active_line { - background-color: #353637; + background-color: #353637 } .ace-idle-fingers .ace_marker-layer .ace_selected_word { - border: 1px solid rgba(90, 100, 126, 0.88); + border: 1px solid rgba(90, 100, 126, 0.88) } .ace-idle-fingers .ace_invisible { - color: #404040; + color: #404040 } -.ace-idle-fingers .ace_keyword, .ace-idle-fingers .ace_meta { - color:#CC7833; +.ace-idle-fingers .ace_keyword, +.ace-idle-fingers .ace_meta { + color: #CC7833 } -.ace-idle-fingers .ace_constant, .ace-idle-fingers .ace_constant.ace_other { - color:#6C99BB; +.ace-idle-fingers .ace_constant, +.ace-idle-fingers .ace_constant.ace_other { + color: #6C99BB } -.ace-idle-fingers .ace_constant.ace_character, { - color:#6C99BB; +.ace-idle-fingers .ace_constant.ace_character, + { + color: #6C99BB } -.ace-idle-fingers .ace_constant.ace_character.ace_escape, { - color:#6C99BB; +.ace-idle-fingers .ace_constant.ace_character.ace_escape, + { + color: #6C99BB } .ace-idle-fingers .ace_invalid { - color:#FFFFFF; -background-color:#FF0000; + color: #FFFFFF; + background-color: #FF0000 } .ace-idle-fingers .ace_support.ace_constant { - color:#6C99BB; + color: #6C99BB } .ace-idle-fingers .ace_fold { - background-color: #CC7833; - border-color: #FFFFFF; + background-color: #CC7833; + border-color: #FFFFFF } .ace-idle-fingers .ace_support.ace_function { - color:#B83426; + color: #B83426 } .ace-idle-fingers .ace_variable.ace_parameter { - font-style:italic; + font-style: italic } .ace-idle-fingers .ace_string { - color:#A5C261; + color: #A5C261 } .ace-idle-fingers .ace_string.ace_regexp { - color:#CCCC33; + color: #CCCC33 } .ace-idle-fingers .ace_comment { - font-style:italic; -color:#BC9458; + font-style: italic; + color: #BC9458 } .ace-idle-fingers .ace_meta.ace_tag { - color:#FFE5BB; + color: #FFE5BB } .ace-idle-fingers .ace_entity.ace_name { - color:#FFC66D; + color: #FFC66D } .ace-idle-fingers .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-idle-fingers .ace_collab.ace_user1 { - color:#323232; - background-color:#FFF980; + color: #323232; + background-color: #FFF980 } .ace-idle-fingers .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMwMjL6zzBz5sz/ABEUBGCqhK6UAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMwMjL6zzBz5sz/ABEUBGCqhK6UAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index 251d6e63..fcb3be31 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-idle-fingers"; exports.cssText = require('ace/requirejs/text!./idle_fingers.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +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 ede07375..04ea3144 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -1,144 +1,147 @@ - .ace-kr-theme .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-kr-theme .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-kr-theme .ace_gutter { background: #1c1917; - color: #FCFFE0; + color: #FCFFE0 } .ace-kr-theme .ace_print_margin { width: 1px; - background: #1c1917; + background: #1c1917 } .ace-kr-theme .ace_scroller { - background-color: #0B0A09; + background-color: #0B0A09 } .ace-kr-theme .ace_text-layer { - color: #FCFFE0; + color: #FCFFE0 } .ace-kr-theme .ace_cursor { - border-left: 2px solid #FF9900; + border-left: 2px solid #FF9900 } .ace-kr-theme .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #FF9900; + border-bottom: 1px solid #FF9900 } .ace-kr-theme .ace_marker-layer .ace_selection { - background: rgba(170, 0, 255, 0.45); + background: rgba(170, 0, 255, 0.45) } .ace-kr-theme.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #0B0A09; - border-radius: 2px; + border-radius: 2px } .ace-kr-theme .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-kr-theme .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(255, 177, 111, 0.32); + border: 1px solid rgba(255, 177, 111, 0.32) } .ace-kr-theme .ace_marker-layer .ace_active_line { - background: #38403D; + background: #38403D } .ace-kr-theme .ace_gutter_active_line { - background-color : #38403D; + background-color : #38403D } .ace-kr-theme .ace_marker-layer .ace_selected_word { - border: 1px solid rgba(170, 0, 255, 0.45); + border: 1px solid rgba(170, 0, 255, 0.45) } .ace-kr-theme .ace_invisible { - color: rgba(255, 177, 111, 0.32); + color: rgba(255, 177, 111, 0.32) } -.ace-kr-theme .ace_keyword, .ace-kr-theme .ace_meta { - color:#949C8B; +.ace-kr-theme .ace_keyword, +.ace-kr-theme .ace_meta { + color: #949C8B } -.ace-kr-theme .ace_constant, .ace-kr-theme .ace_constant.ace_other { - color:rgba(210, 117, 24, 0.76); +.ace-kr-theme .ace_constant, +.ace-kr-theme .ace_constant.ace_other { + color: rgba(210, 117, 24, 0.76) } -.ace-kr-theme .ace_constant.ace_character, { - color:rgba(210, 117, 24, 0.76); +.ace-kr-theme .ace_constant.ace_character, + { + color: rgba(210, 117, 24, 0.76) } -.ace-kr-theme .ace_constant.ace_character.ace_escape, { - color:rgba(210, 117, 24, 0.76); +.ace-kr-theme .ace_constant.ace_character.ace_escape, + { + color: rgba(210, 117, 24, 0.76) } .ace-kr-theme .ace_invalid { - color:#F8F8F8; -background-color:#A41300; + color: #F8F8F8; + background-color: #A41300 } .ace-kr-theme .ace_support { - color:#9FC28A; + color: #9FC28A } .ace-kr-theme .ace_support.ace_constant { - color:#C27E66; + color: #C27E66 } .ace-kr-theme .ace_fold { - background-color: #949C8B; - border-color: #FCFFE0; + background-color: #949C8B; + border-color: #FCFFE0 } .ace-kr-theme .ace_support.ace_function { - color:#85873A; + color: #85873A } .ace-kr-theme .ace_storage { - color:#FFEE80; + color: #FFEE80 } .ace-kr-theme .ace_string.ace_regexp { - color:rgba(125, 255, 192, 0.65); + color: rgba(125, 255, 192, 0.65) } .ace-kr-theme .ace_comment { - font-style:italic; -color:#706D5B; + font-style: italic; + color: #706D5B } .ace-kr-theme .ace_variable { - color:#D1A796; + color: #D1A796 } .ace-kr-theme .ace_variable.ace_language { - color:#FF80E1; + color: #FF80E1 } .ace-kr-theme .ace_meta.ace_tag { - color:#BABD9C; + color: #BABD9C } .ace-kr-theme .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-kr-theme .ace_markup.ace_list { - background-color:#0F0040; + background-color: #0F0040 } .ace-kr-theme .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPg5uL8zzBz5sz/AA1WA+hUYIqjAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPg5uL8zzBz5sz/AA1WA+hUYIqjAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index da7dd1d3..81faf395 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-kr-theme"; exports.cssText = require('ace/requirejs/text!./kr_theme.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +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 19a74801..7a87829f 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -1,148 +1,159 @@ - .ace-merbivore .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-merbivore .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-merbivore .ace_gutter { background: #202020; - color: #E6E1DC; + color: #E6E1DC } .ace-merbivore .ace_print_margin { width: 1px; - background: #555651; + background: #555651 } .ace-merbivore .ace_scroller { - background-color: #161616; + background-color: #161616 } .ace-merbivore .ace_text-layer { - color: #E6E1DC; + color: #E6E1DC } .ace-merbivore .ace_cursor { - border-left: 2px solid #FFFFFF; + border-left: 2px solid #FFFFFF } .ace-merbivore .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF } .ace-merbivore .ace_marker-layer .ace_selection { - background: #454545; + background: #454545 } .ace-merbivore.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #161616; - border-radius: 2px; + border-radius: 2px } .ace-merbivore .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-merbivore .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #404040; + border: 1px solid #404040 } .ace-merbivore .ace_marker-layer .ace_active_line { - background: #333435; + background: #333435 } .ace-merbivore .ace_gutter_active_line { - background-color: #333435; + background-color: #333435 } .ace-merbivore .ace_marker-layer .ace_selected_word { - border: 1px solid #454545; + border: 1px solid #454545 } .ace-merbivore .ace_invisible { - color: #404040; + color: #404040 } -.ace-merbivore .ace_keyword, .ace-merbivore .ace_meta { - color:#FC6F09; +.ace-merbivore .ace_keyword, +.ace-merbivore .ace_meta { + color: #FC6F09 } -.ace-merbivore .ace_constant, .ace-merbivore .ace_constant.ace_other { - color:#1EDAFB; +.ace-merbivore .ace_constant, +.ace-merbivore .ace_constant.ace_other { + color: #1EDAFB } -.ace-merbivore .ace_constant.ace_character, { - color:#1EDAFB; +.ace-merbivore .ace_constant.ace_character.ace_escape { + color: #519F50 } -.ace-merbivore .ace_constant.ace_character.ace_escape, { - color:#1EDAFB; +.ace-merbivore .ace_constant.ace_character, + { + color: #1EDAFB +} + +.ace-merbivore .ace_constant.ace_character.ace_escape, + { + color: #1EDAFB } .ace-merbivore .ace_constant.ace_language { - color:#FDC251; + color: #FDC251 } .ace-merbivore .ace_constant.ace_library { - color:#8DFF0A; + color: #8DFF0A } .ace-merbivore .ace_constant.ace_numeric { - color:#58C554; + color: #58C554 } .ace-merbivore .ace_invalid { - color:#FFFFFF; -background-color:#990000; + color: #FFFFFF; + background-color: #990000 } .ace-merbivore .ace_support.ace_constant { - color:#8DFF0A; + color: #8DFF0A } .ace-merbivore .ace_fold { - background-color: #FC6F09; - border-color: #E6E1DC; + background-color: #FC6F09; + border-color: #E6E1DC } .ace-merbivore .ace_support.ace_function { - color:#FC6F09; + color: #FC6F09 } .ace-merbivore .ace_support.ace_type { - color:#1EDAFB; + color: #1EDAFB } .ace-merbivore .ace_storage { - color:#FC6F09; + color: #FC6F09 } .ace-merbivore .ace_string { - color:#8DFF0A; + color: #8DFF0A } .ace-merbivore .ace_comment { - font-style:italic; -color:#AD2EA4; + font-style: italic; + color: #AD2EA4 +} + +.ace-merbivore .ace_entity.ace_name.ace_tag { + color: #FC6F09 } .ace-merbivore .ace_meta.ace_tag { - color:#FC6F09; + color: #FC6F09 } .ace-merbivore .ace_entity.ace_other.ace_attribute-name { - color:#FFFF89; + color: #FFFF89 } .ace-merbivore .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-merbivore .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQExP7zzBz5sz/AA50BAyDznYhAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQExP7zzBz5sz/AA50BAyDznYhAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js index 254fdad0..bba49410 100644 --- a/lib/ace/theme/merbivore.js +++ b/lib/ace/theme/merbivore.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-merbivore"; exports.cssText = require('ace/requirejs/text!./merbivore.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index 591bd3a9..3265dfb4 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -1,154 +1,165 @@ - .ace-merbivore-soft .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-merbivore-soft .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-merbivore-soft .ace_gutter { background: #262424; - color: #E6E1DC; + color: #E6E1DC } .ace-merbivore-soft .ace_print_margin { width: 1px; - background: #262424; + background: #262424 } .ace-merbivore-soft .ace_scroller { - background-color: #1C1C1C; + background-color: #1C1C1C } .ace-merbivore-soft .ace_text-layer { - color: #E6E1DC; + color: #E6E1DC } .ace-merbivore-soft .ace_cursor { - border-left: 2px solid #FFFFFF; + border-left: 2px solid #FFFFFF } .ace-merbivore-soft .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF } .ace-merbivore-soft .ace_marker-layer .ace_selection { - background: #494949; + background: #494949 } .ace-merbivore-soft.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #1C1C1C; - border-radius: 2px; + border-radius: 2px } .ace-merbivore-soft .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-merbivore-soft .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #404040; + border: 1px solid #404040 } .ace-merbivore-soft .ace_marker-layer .ace_active_line { - background: #333435; + background: #333435 } .ace-merbivore-soft .ace_gutter_active_line { - background-color: #333435; + background-color: #333435 } .ace-merbivore-soft .ace_marker-layer .ace_selected_word { - border: 1px solid #494949; + border: 1px solid #494949 } .ace-merbivore-soft .ace_invisible { - color: #404040; + color: #404040 } -.ace-merbivore-soft .ace_keyword, .ace-merbivore-soft .ace_meta { - color:#FC803A; +.ace-merbivore-soft .ace_keyword, +.ace-merbivore-soft .ace_meta { + color: #FC803A } -.ace-merbivore-soft .ace_constant, .ace-merbivore-soft .ace_constant.ace_other { - color:#68C1D8; +.ace-merbivore-soft .ace_constant, +.ace-merbivore-soft .ace_constant.ace_other { + color: #68C1D8 } -.ace-merbivore-soft .ace_constant.ace_character, { - color:#68C1D8; +.ace-merbivore-soft .ace_constant.ace_character.ace_escape { + color: #B3E5B4 } -.ace-merbivore-soft .ace_constant.ace_character.ace_escape, { - color:#68C1D8; +.ace-merbivore-soft .ace_constant.ace_character, + { + color: #68C1D8 +} + +.ace-merbivore-soft .ace_constant.ace_character.ace_escape, + { + color: #68C1D8 } .ace-merbivore-soft .ace_constant.ace_language { - color:#E1C582; + color: #E1C582 } .ace-merbivore-soft .ace_constant.ace_library { - color:#8EC65F; + color: #8EC65F } .ace-merbivore-soft .ace_constant.ace_numeric { - color:#7FC578; + color: #7FC578 } .ace-merbivore-soft .ace_invalid { - color:#FFFFFF; -background-color:#FE3838; + color: #FFFFFF; + background-color: #FE3838 } .ace-merbivore-soft .ace_invalid.ace_deprecated { - color:#FFFFFF; -background-color:#FE3838; + color: #FFFFFF; + background-color: #FE3838 } .ace-merbivore-soft .ace_support.ace_constant { - color:#8EC65F; + color: #8EC65F } .ace-merbivore-soft .ace_fold { - background-color: #FC803A; - border-color: #E6E1DC; + background-color: #FC803A; + border-color: #E6E1DC } .ace-merbivore-soft .ace_support.ace_type { - color:#68C1D8; + color: #68C1D8 } .ace-merbivore-soft .ace_storage { - color:#FC803A; + color: #FC803A } .ace-merbivore-soft .ace_string { - color:#8EC65F; + color: #8EC65F } .ace-merbivore-soft .ace_comment { - font-style:italic; -color:#AC4BB8; + font-style: italic; + color: #AC4BB8 } .ace-merbivore-soft .ace_meta { - font-style:italic; -color:#AC4BB8; + font-style: italic; + color: #AC4BB8 +} + +.ace-merbivore-soft .ace_entity.ace_name.ace_tag { + color: #FC803A } .ace-merbivore-soft .ace_meta.ace_tag { - color:#FC803A; + color: #FC803A } .ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name { - color:#EAF1A3; + color: #EAF1A3 } .ace-merbivore-soft .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-merbivore-soft .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkZH5zzBz5sz/AA8EBB6crd1rAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkZH5zzBz5sz/AA8EBB6crd1rAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js index d5e7dbbd..5848e289 100644 --- a/lib/ace/theme/merbivore_soft.js +++ b/lib/ace/theme/merbivore_soft.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-merbivore-soft"; exports.cssText = require('ace/requirejs/text!./merbivore_soft.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index e8c79c76..dc1f17aa 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -1,160 +1,167 @@ - .ace-mono-industrial .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-mono-industrial .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-mono-industrial .ace_gutter { background: #1d2521; - color: #C5C9C9; + color: #C5C9C9 } .ace-mono-industrial .ace_print_margin { width: 1px; - background: #555651; + background: #555651 } .ace-mono-industrial .ace_scroller { - background-color: #222C28; + background-color: #222C28 } .ace-mono-industrial .ace_text-layer { - color: #FFFFFF; + color: #FFFFFF } .ace-mono-industrial .ace_cursor { - border-left: 2px solid #FFFFFF; + border-left: 2px solid #FFFFFF } .ace-mono-industrial .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF } .ace-mono-industrial .ace_marker-layer .ace_selection { - background: rgba(145, 153, 148, 0.40); + background: rgba(145, 153, 148, 0.40) } .ace-mono-industrial.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #222C28; - border-radius: 2px; + border-radius: 2px } .ace-mono-industrial .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-mono-industrial .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(102, 108, 104, 0.50); + border: 1px solid rgba(102, 108, 104, 0.50) } .ace-mono-industrial .ace_marker-layer .ace_active_line { - background: rgba(12, 13, 12, 0.25); + background: rgba(12, 13, 12, 0.25) } .ace-mono-industrial .ace_gutter_active_line { - background-color: rgba(12, 13, 12, 0.25); + background-color: rgba(12, 13, 12, 0.25) } .ace-mono-industrial .ace_marker-layer .ace_selected_word { - border: 1px solid rgba(145, 153, 148, 0.40); + border: 1px solid rgba(145, 153, 148, 0.40) } .ace-mono-industrial .ace_invisible { - color: rgba(102, 108, 104, 0.50); + color: rgba(102, 108, 104, 0.50) } -.ace-mono-industrial .ace_keyword, .ace-mono-industrial .ace_meta { - color:#A39E64; +.ace-mono-industrial .ace_keyword, +.ace-mono-industrial .ace_meta { + color: #A39E64 } .ace-mono-industrial .ace_keyword.ace_operator { - color:#A8B3AB; + color: #A8B3AB } -.ace-mono-industrial .ace_constant, .ace-mono-industrial .ace_constant.ace_other { - color:#E98800; +.ace-mono-industrial .ace_constant, +.ace-mono-industrial .ace_constant.ace_other { + color: #E98800 } -.ace-mono-industrial .ace_constant.ace_character, { - color:#E98800; +.ace-mono-industrial .ace_constant.ace_character, + { + color: #E98800 } -.ace-mono-industrial .ace_constant.ace_character.ace_escape, { - color:#E98800; +.ace-mono-industrial .ace_constant.ace_character.ace_escape, + { + color: #E98800 } .ace-mono-industrial .ace_constant.ace_numeric { - color:#E98800; + color: #E98800 } .ace-mono-industrial .ace_invalid { - color:#FFFFFF; -background-color:rgba(153, 0, 0, 0.68); + color: #FFFFFF; + background-color: rgba(153, 0, 0, 0.68) } .ace-mono-industrial .ace_support.ace_constant { - color:#C87500; + color: #C87500 } .ace-mono-industrial .ace_fold { - background-color: #A8B3AB; - border-color: #FFFFFF; + background-color: #A8B3AB; + border-color: #FFFFFF } .ace-mono-industrial .ace_support.ace_function { - color:#588E60; + color: #588E60 } .ace-mono-industrial .ace_support.ace_type { - color:#5778B6; + color: #5778B6 } .ace-mono-industrial .ace_support.ace_class { - color:#5778B6; + color: #5778B6 } .ace-mono-industrial .ace_storage { - color:#C23B00; + color: #C23B00 } .ace-mono-industrial .ace_variable { - color:#A8B3AB; + color: #A8B3AB } .ace-mono-industrial .ace_variable.ace_parameter { - color:#648BD2; + color: #648BD2 } .ace-mono-industrial .ace_comment { - color:#666C68; -background-color:#151C19; + color: #666C68; + background-color: #151C19 } .ace-mono-industrial .ace_variable.ace_language { - color:#648BD2; + color: #648BD2 } .ace-mono-industrial .ace_entity.ace_other.ace_attribute-name { - color:#909993; + color: #909993 +} + +.ace-mono-industrial .ace_entity.ace_name.ace_tag { + color: #A65EFF } .ace-mono-industrial .ace_entity.ace_name { - color:#5778B6; + color: #5778B6 } .ace-mono-industrial .ace_entity.ace_name.ace_function { - color:#A8B3AB; + color: #A8B3AB } .ace-mono-industrial .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-mono-industrial .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index d17f39f2..288cd710 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-mono-industrial"; exports.cssText = require('ace/requirejs/text!./mono_industrial.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 19c95ed3..2fc48e12 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -1,164 +1,169 @@ - .ace-monokai .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-monokai .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-monokai .ace_gutter { background: #2f3129; - color: #f1f1f1; + color: #f1f1f1 } .ace-monokai .ace_print_margin { width: 1px; - background: #555651; + background: #555651 } .ace-monokai .ace_scroller { - background-color: #272822; + background-color: #272822 } .ace-monokai .ace_text-layer { - color: #F8F8F2; + color: #F8F8F2 } .ace-monokai .ace_cursor { - border-left: 2px solid #F8F8F0; + border-left: 2px solid #F8F8F0 } .ace-monokai .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #F8F8F0; + border-bottom: 1px solid #F8F8F0 } .ace-monokai .ace_marker-layer .ace_selection { - background: #49483E; + background: #49483E } .ace-monokai.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #272822; - border-radius: 2px; + border-radius: 2px } .ace-monokai .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-monokai .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #49483E; + border: 1px solid #49483E } .ace-monokai .ace_marker-layer .ace_active_line { - background: #49483E; + background: #49483E } .ace-monokai .ace_gutter_active_line { - background-color: #191916; + background-color: #191916 } .ace-monokai .ace_marker-layer .ace_selected_word { - border: 1px solid #49483E; + border: 1px solid #49483E } .ace-monokai .ace_invisible { - color: #49483E; + color: #49483E } -.ace-monokai .ace_keyword, .ace-monokai .ace_meta { - color:#F92672; +.ace-monokai .ace_keyword, +.ace-monokai .ace_meta { + color: #F92672 } -.ace-monokai .ace_constant.ace_character { - color:#AE81FF; +.ace-monokai .ace_constant.ace_character { + color: #AE81FF } .ace-monokai .ace_constant.ace_language { - color:#AE81FF; + color: #AE81FF } .ace-monokai .ace_constant.ace_numeric { - color:#AE81FF; + color: #AE81FF } .ace-monokai .ace_constant.ace_other { - color:#AE81FF; + color: #AE81FF } .ace-monokai .ace_invalid { - color:#F8F8F0; -background-color:#F92672; + color: #F8F8F0; + background-color: #F92672 } .ace-monokai .ace_invalid.ace_deprecated { - color:#F8F8F0; -background-color:#AE81FF; + color: #F8F8F0; + background-color: #AE81FF } .ace-monokai .ace_support.ace_constant { - color:#66D9EF; + color: #66D9EF } .ace-monokai .ace_fold { - background-color: #A6E22E; - border-color: #F8F8F2; + background-color: #A6E22E; + border-color: #F8F8F2 } .ace-monokai .ace_support.ace_function { - color:#66D9EF; + color: #66D9EF } .ace-monokai .ace_support.ace_type { - font-style:italic; -color:#66D9EF; + font-style: italic; + color: #66D9EF } .ace-monokai .ace_support.ace_class { - font-style:italic; -color:#66D9EF; + font-style: italic; + color: #66D9EF } .ace-monokai .ace_storage { - color:#F92672; + color: #F92672 } -.ace-monokai .ace_storage.ace_type, .ace-monokai .ace_support.ace_type { - font-style:italic; -color:#66D9EF; +.ace-monokai .ace_storage.ace_type, +.ace-monokai .ace_support.ace_type { + font-style: italic; + color: #66D9EF } .ace-monokai .ace_variable { - color:#A6E22E; + color: #A6E22E } .ace-monokai .ace_variable.ace_parameter { - font-style:italic; -color:#FD971F; + font-style: italic; + color: #FD971F } .ace-monokai .ace_string { - color:#E6DB74; + color: #E6DB74 } .ace-monokai .ace_comment { - color:#75715E; + color: #75715E } .ace-monokai .ace_entity.ace_other.ace_attribute-name { - color:#A6E22E; + color: #A6E22E } .ace-monokai .ace_entity.ace_name.ace_function { - color:#A6E22E; + color: #A6E22E +} + +.ace-monokai .ace_entity.ace_name.ace_tag { + color: #F92672 } .ace-monokai .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-monokai .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ11D6z7Bq1ar/ABCKBG6g04U2AAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ11D6z7Bq1ar/ABCKBG6g04U2AAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index b41141b0..fe4283c6 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-monokai"; exports.cssText = require('ace/requirejs/text!./monokai.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index 104d5168..44ef690f 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -1,154 +1,161 @@ - .ace-pastel-on-dark .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-pastel-on-dark .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-pastel-on-dark .ace_gutter { background: #353030; - color: #8F938F; + color: #8F938F } .ace-pastel-on-dark .ace_print_margin { width: 1px; - background: #353030; + background: #353030 } .ace-pastel-on-dark .ace_scroller { - background-color: #2C2828; + background-color: #2C2828 } .ace-pastel-on-dark .ace_text-layer { - color: #8F938F; + color: #8F938F } .ace-pastel-on-dark .ace_cursor { - border-left: 2px solid #A7A7A7; + border-left: 2px solid #A7A7A7 } .ace-pastel-on-dark .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #A7A7A7; + border-bottom: 1px solid #A7A7A7 } .ace-pastel-on-dark .ace_marker-layer .ace_selection { - background: rgba(221, 240, 255, 0.20); + background: rgba(221, 240, 255, 0.20) } .ace-pastel-on-dark.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #2C2828; - border-radius: 2px; + border-radius: 2px } .ace-pastel-on-dark .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-pastel-on-dark .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(255, 255, 255, 0.25); + border: 1px solid rgba(255, 255, 255, 0.25) } .ace-pastel-on-dark .ace_marker-layer .ace_active_line { - background: rgba(255, 255, 255, 0.031); + background: rgba(255, 255, 255, 0.031) } .ace-pastel-on-dark .ace_gutter_active_line { - background-color: rgba(255, 255, 255, 0.031); + background-color: rgba(255, 255, 255, 0.031) } .ace-pastel-on-dark .ace_marker-layer .ace_selected_word { - border: 1px solid rgba(221, 240, 255, 0.20); + border: 1px solid rgba(221, 240, 255, 0.20) } .ace-pastel-on-dark .ace_invisible { - color: rgba(255, 255, 255, 0.25); + color: rgba(255, 255, 255, 0.25) } -.ace-pastel-on-dark .ace_keyword, .ace-pastel-on-dark .ace_meta { - color:#757aD8; +.ace-pastel-on-dark .ace_keyword, +.ace-pastel-on-dark .ace_meta { + color: #757aD8 } .ace-pastel-on-dark .ace_keyword.ace_operator { - color:#797878; + color: #797878 } -.ace-pastel-on-dark .ace_constant, .ace-pastel-on-dark .ace_constant.ace_other { - color:#4FB7C5; +.ace-pastel-on-dark .ace_constant, +.ace-pastel-on-dark .ace_constant.ace_other { + color: #4FB7C5 } -.ace-pastel-on-dark .ace_constant.ace_character, { - color:#4FB7C5; +.ace-pastel-on-dark .ace_constant.ace_character { + color: #AFA472 } -.ace-pastel-on-dark .ace_constant.ace_character.ace_escape, { - color:#4FB7C5; +.ace-pastel-on-dark .ace_constant.ace_character, + { + color: #4FB7C5 +} + +.ace-pastel-on-dark .ace_constant.ace_character.ace_escape, + { + color: #4FB7C5 } .ace-pastel-on-dark .ace_constant.ace_language { - color:#DE8E30; + color: #DE8E30 } .ace-pastel-on-dark .ace_constant.ace_numeric { - color:#CCCCCC; + color: #CCCCCC } .ace-pastel-on-dark .ace_invalid { - color:#F8F8F8; -background-color:rgba(86, 45, 86, 0.75); + color: #F8F8F8; + background-color: rgba(86, 45, 86, 0.75) } .ace-pastel-on-dark .ace_invalid.ace_illegal { - color:#F8F8F8; -background-color:rgba(86, 45, 86, 0.75); + color: #F8F8F8; + background-color: rgba(86, 45, 86, 0.75) } .ace-pastel-on-dark .ace_invalid.ace_deprecated { - text-decoration:underline; -font-style:italic; -color:#D2A8A1; + text-decoration: underline; + font-style: italic; + color: #D2A8A1 } .ace-pastel-on-dark .ace_fold { - background-color: #757aD8; - border-color: #8F938F; + background-color: #757aD8; + border-color: #8F938F } .ace-pastel-on-dark .ace_support.ace_function { - color:#AEB2F8; + color: #AEB2F8 } .ace-pastel-on-dark .ace_string { - color:#66A968; + color: #66A968 } .ace-pastel-on-dark .ace_string.ace_regexp { - color:#E9C062; + color: #E9C062 } .ace-pastel-on-dark .ace_comment { - color:#A6C6FF; + color: #A6C6FF } .ace-pastel-on-dark .ace_variable { - color:#BEBF55; + color: #BEBF55 } .ace-pastel-on-dark .ace_variable.ace_language { - color:#C1C144; + color: #C1C144 } .ace-pastel-on-dark .ace_xml_pe { - color:#494949; + color: #494949 } .ace-pastel-on-dark .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-pastel-on-dark .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0dD4z9DR0fEfAA+vBBPqhbn1AAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0dD4z9DR0fEfAA+vBBPqhbn1AAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js index 28672150..93776772 100644 --- a/lib/ace/theme/pastel_on_dark.js +++ b/lib/ace/theme/pastel_on_dark.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-pastel-on-dark"; exports.cssText = require('ace/requirejs/text!./pastel_on_dark.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index d67fa827..4de55264 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -1,147 +1,151 @@ - .ace-solarized-dark .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-solarized-dark .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-solarized-dark .ace_gutter { background: #01313f; - color: #d0edf7; + color: #d0edf7 } .ace-solarized-dark .ace_print_margin { width: 1px; - background: #33555E; + background: #33555E } .ace-solarized-dark .ace_scroller { - background-color: #002B36; + background-color: #002B36 } .ace-solarized-dark .ace_text-layer { - color: #93A1A1; + color: #93A1A1 } .ace-solarized-dark .ace_cursor { - border-left: 2px solid #D30102; + border-left: 2px solid #D30102 } .ace-solarized-dark .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #D30102; + border-bottom: 1px solid #D30102 } .ace-solarized-dark .ace_marker-layer .ace_selection { - background: #073642; + background: #073642 } .ace-solarized-dark.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #002B36; - border-radius: 2px; + border-radius: 2px } .ace-solarized-dark .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-solarized-dark .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(147, 161, 161, 0.50); + border: 1px solid rgba(147, 161, 161, 0.50) } .ace-solarized-dark .ace_marker-layer .ace_active_line { - background: #073642; + background: #073642 } .ace-solarized-dark .ace_gutter_active_line { - background-color: #0d3440; + background-color: #0d3440 } .ace-solarized-dark .ace_marker-layer .ace_selected_word { - border: 1px solid #073642; + border: 1px solid #073642 } .ace-solarized-dark .ace_invisible { - color: rgba(147, 161, 161, 0.50); + color: rgba(147, 161, 161, 0.50) } -.ace-solarized-dark .ace_keyword, .ace-solarized-dark .ace_meta { - color:#859900; +.ace-solarized-dark .ace_keyword, +.ace-solarized-dark .ace_meta { + color: #859900 } -.ace-solarized-dark .ace_constant.ace_character { - color:#CB4B16; +.ace-solarized-dark .ace_constant.ace_character { + color: #CB4B16 } .ace-solarized-dark .ace_constant.ace_language { - color:#B58900; + color: #B58900 } .ace-solarized-dark .ace_constant.ace_numeric { - color:#D33682; + color: #D33682 } .ace-solarized-dark .ace_constant.ace_other { - color:#CB4B16; + color: #CB4B16 } .ace-solarized-dark .ace_fold { - background-color: #268BD2; - border-color: #93A1A1; + background-color: #268BD2; + border-color: #93A1A1 } .ace-solarized-dark .ace_support.ace_function { - color:#268BD2; + color: #268BD2 } .ace-solarized-dark .ace_support.ace_type { - color:#859900; + color: #859900 } .ace-solarized-dark .ace_support.ace_class { - color:#859900; + color: #859900 } .ace-solarized-dark .ace_storage { - color:#93A1A1; + color: #93A1A1 } .ace-solarized-dark .ace_variable { - color:#268BD2; + color: #268BD2 } .ace-solarized-dark .ace_string { - color:#2AA198; + color: #2AA198 } .ace-solarized-dark .ace_string.ace_regexp { - color:#D30102; + color: #D30102 } .ace-solarized-dark .ace_comment { - font-style:italic; -color:#657B83; + font-style: italic; + color: #657B83 } .ace-solarized-dark .ace_variable.ace_language { - color:#268BD2; + color: #268BD2 } .ace-solarized-dark .ace_entity.ace_other.ace_attribute-name { - color:#93A1A1; + color: #93A1A1 } .ace-solarized-dark .ace_entity.ace_name.ace_function { - color:#268BD2; + color: #268BD2 +} + +.ace-solarized-dark .ace_entity.ace_name.ace_tag { + color: #268BD2 } .ace-solarized-dark .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-solarized-dark .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db7zzBz5sz/AA82BCv7wOIDAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db7zzBz5sz/AA82BCv7wOIDAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js index 2b09b337..f2ef096b 100644 --- a/lib/ace/theme/solarized_dark.js +++ b/lib/ace/theme/solarized_dark.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-solarized-dark"; exports.cssText = require('ace/requirejs/text!./solarized_dark.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index 5f8cea3b..e0146180 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -1,146 +1,150 @@ - .ace-solarized-light .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-solarized-light .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-solarized-light .ace_gutter { background: #fbf1d3; - color: #333; + color: #333 } .ace-solarized-light .ace_print_margin { width: 1px; - background: #e8e8e8; + background: #e8e8e8 } .ace-solarized-light .ace_scroller { - background-color: #FDF6E3; + background-color: #FDF6E3 } .ace-solarized-light .ace_text-layer { - color: #586E75; + color: #586E75 } .ace-solarized-light .ace_cursor { - border-left: 2px solid #000000; + border-left: 2px solid #000000 } .ace-solarized-light .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #000000; + border-bottom: 1px solid #000000 } .ace-solarized-light .ace_marker-layer .ace_selection { - background: #073642; + background: #073642 } .ace-solarized-light.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #FDF6E3; - border-radius: 2px; + border-radius: 2px } .ace-solarized-light .ace_marker-layer .ace_step { - background: rgb(255, 255, 0); + background: rgb(255, 255, 0) } .ace-solarized-light .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(147, 161, 161, 0.50); + border: 1px solid rgba(147, 161, 161, 0.50) } .ace-solarized-light .ace_marker-layer .ace_active_line { - background: #EEE8D5; + background: #EEE8D5 } .ace-solarized-light .ace_gutter_active_line { - background-color : #dcdcdc; + background-color : #dcdcdc } .ace-solarized-light .ace_marker-layer .ace_selected_word { - border: 1px solid #073642; + border: 1px solid #073642 } .ace-solarized-light .ace_invisible { - color: rgba(147, 161, 161, 0.50); + color: rgba(147, 161, 161, 0.50) } -.ace-solarized-light .ace_keyword, .ace-solarized-light .ace_meta { - color:#859900; +.ace-solarized-light .ace_keyword, +.ace-solarized-light .ace_meta { + color: #859900 } -.ace-solarized-light .ace_constant.ace_character { - color:#CB4B16; +.ace-solarized-light .ace_constant.ace_character { + color: #CB4B16 } .ace-solarized-light .ace_constant.ace_language { - color:#B58900; + color: #B58900 } .ace-solarized-light .ace_constant.ace_numeric { - color:#D33682; + color: #D33682 } .ace-solarized-light .ace_constant.ace_other { - color:#CB4B16; + color: #CB4B16 } .ace-solarized-light .ace_fold { - background-color: #268BD2; - border-color: #586E75; + background-color: #268BD2; + border-color: #586E75 } .ace-solarized-light .ace_support.ace_function { - color:#268BD2; + color: #268BD2 } .ace-solarized-light .ace_support.ace_type { - color:#859900; + color: #859900 } .ace-solarized-light .ace_support.ace_class { - color:#859900; + color: #859900 } .ace-solarized-light .ace_storage { - color:#073642; + color: #073642 } .ace-solarized-light .ace_variable { - color:#268BD2; + color: #268BD2 } .ace-solarized-light .ace_string { - color:#2AA198; + color: #2AA198 } .ace-solarized-light .ace_string.ace_regexp { - color:#D30102; + color: #D30102 } .ace-solarized-light .ace_comment { - color:#93A1A1; + color: #93A1A1 } .ace-solarized-light .ace_variable.ace_language { - color:#268BD2; + color: #268BD2 } .ace-solarized-light .ace_entity.ace_other.ace_attribute-name { - color:#93A1A1; + color: #93A1A1 } .ace-solarized-light .ace_entity.ace_name.ace_function { - color:#268BD2; + color: #268BD2 +} + +.ace-solarized-light .ace_entity.ace_name.ace_tag { + color: #268BD2 } .ace-solarized-light .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-solarized-light .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4++3xf4ZVq1b9BwAjxwbT1g3hiwAAAABJRU5ErkJggg==) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4++3xf4ZVq1b9BwAjxwbT1g3hiwAAAABJRU5ErkJggg==) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js index e4095c1e..a8e9e10f 100644 --- a/lib/ace/theme/solarized_light.js +++ b/lib/ace/theme/solarized_light.js @@ -34,6 +34,6 @@ exports.isDark = false; exports.cssClass = "ace-solarized-light"; exports.cssText = require('ace/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); }); diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index 80b9ae1d..e4eaf650 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -167,4 +167,4 @@ .ace-tm .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/textmate.js b/lib/ace/theme/textmate.js index 47bbae0b..1f684f74 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -29,10 +29,9 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { -"use strict"; exports.isDark = false; -exports.cssClass = "ace-tm"; +exports.cssClass = "ace-textmate"; exports.cssText = require('ace/requirejs/text!./textmate.css'); var dom = require("../lib/dom"); diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index e5bb2e88..1fff73ed 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -1,180 +1,189 @@ - .ace-tomorrow .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-tomorrow .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-tomorrow .ace_gutter { background: #f6f6f6; - color: #4D4D4C; + color: #4D4D4C } .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 { 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 { 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; + background: #EFEFEF } .ace-tomorrow .ace_gutter_active_line { - background-color : #dcdcdc; + background-color : #dcdcdc } .ace-tomorrow .ace_marker-layer .ace_selected_word { - border: 1px solid #D6D6D6; + 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 { + color: #8959A8 } .ace-tomorrow .ace_keyword.ace_operator { - color:#3E999F; + color: #3E999F } -.ace-tomorrow .ace_constant.ace_character { - color:#F5871F; +.ace-tomorrow .ace_keyword.ace_other.ace_unit { + color: #F5871F +} + +.ace-tomorrow .ace_constant.ace_character { + color: #F5871F } .ace-tomorrow .ace_constant.ace_language { - color:#F5871F; + color: #F5871F } .ace-tomorrow .ace_constant.ace_numeric { - color:#F5871F; + 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; + color: #FFFFFF; + background-color: #8959A8 } .ace-tomorrow .ace_support.ace_constant { - color:#F5871F; + color: #F5871F } .ace-tomorrow .ace_fold { - background-color: #4271AE; - border-color: #4D4D4C; + background-color: #4271AE; + border-color: #4D4D4C } .ace-tomorrow .ace_support.ace_function { - color:#4271AE; + color: #4271AE } .ace-tomorrow .ace_support.ace_type { - color:#C99E00; + color: #C99E00 } .ace-tomorrow .ace_support.ace_class { - color:#C99E00; + color: #C99E00 } .ace-tomorrow .ace_storage { - color:#8959A8; + color: #8959A8 } -.ace-tomorrow .ace_storage.ace_type, .ace-tomorrow .ace_support.ace_type { - color:#8959A8; +.ace-tomorrow .ace_storage.ace_type, +.ace-tomorrow .ace_support.ace_type { + color: #8959A8 } .ace-tomorrow .ace_variable { - color:#4271AE; + color: #4271AE } .ace-tomorrow .ace_variable.ace_parameter { - color:#F5871F; + color: #F5871F } .ace-tomorrow .ace_string { - color:#718C00; + color: #718C00 } .ace-tomorrow .ace_string.ace_regexp { - color:#C82829; + color: #C82829 } .ace-tomorrow .ace_comment { - color:#8E908C; + color: #8E908C } .ace-tomorrow .ace_variable { - color:#C82829; + color: #C82829 } .ace-tomorrow .ace_meta.ace_tag { - color:#C82829; + color: #C82829 } .ace-tomorrow .ace_entity.ace_other.ace_attribute-name { - color:#C82829; + color: #C82829 } .ace-tomorrow .ace_entity.ace_name.ace_function { - color:#4271AE; + color: #4271AE +} + +.ace-tomorrow .ace_entity.ace_name.ace_tag { + color: #C82829 } .ace-tomorrow .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-tomorrow .ace_markup.ace_heading { - color:#718C00; + color: #718C00 } .ace-tomorrow .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js index e740a080..acf984f9 100644 --- a/lib/ace/theme/tomorrow.js +++ b/lib/ace/theme/tomorrow.js @@ -34,6 +34,6 @@ exports.isDark = false; exports.cssClass = "ace-tomorrow"; exports.cssText = require('ace/requirejs/text!./tomorrow.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index 90ac0f0c..55d4c05b 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -1,180 +1,189 @@ - .ace-tomorrow-night .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-tomorrow-night .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-tomorrow-night .ace_gutter { background: #25282c; - color: #C5C8C6; + color: #C5C8C6 } .ace-tomorrow-night .ace_print_margin { width: 1px; - background: #25282c; + background: #25282c } .ace-tomorrow-night .ace_scroller { - background-color: #1D1F21; + background-color: #1D1F21 } .ace-tomorrow-night .ace_text-layer { - color: #C5C8C6; + color: #C5C8C6 } .ace-tomorrow-night .ace_cursor { - border-left: 2px solid #AEAFAD; + border-left: 2px solid #AEAFAD } .ace-tomorrow-night .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #AEAFAD; + border-bottom: 1px solid #AEAFAD } .ace-tomorrow-night .ace_marker-layer .ace_selection { - background: #373B41; + background: #373B41 } .ace-tomorrow-night.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #1D1F21; - border-radius: 2px; + border-radius: 2px } .ace-tomorrow-night .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-tomorrow-night .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #4B4E55; + border: 1px solid #4B4E55 } .ace-tomorrow-night .ace_marker-layer .ace_active_line { - background: #282A2E; + background: #282A2E } .ace-tomorrow-night .ace_gutter_active_line { - background-color: #282A2E; + background-color: #282A2E } .ace-tomorrow-night .ace_marker-layer .ace_selected_word { - border: 1px solid #373B41; + border: 1px solid #373B41 } .ace-tomorrow-night .ace_invisible { - color: #4B4E55; + color: #4B4E55 } -.ace-tomorrow-night .ace_keyword, .ace-tomorrow-night .ace_meta { - color:#B294BB; +.ace-tomorrow-night .ace_keyword, +.ace-tomorrow-night .ace_meta { + color: #B294BB } .ace-tomorrow-night .ace_keyword.ace_operator { - color:#8ABEB7; + color: #8ABEB7 } -.ace-tomorrow-night .ace_constant.ace_character { - color:#DE935F; +.ace-tomorrow-night .ace_keyword.ace_other.ace_unit { + color: #DE935F +} + +.ace-tomorrow-night .ace_constant.ace_character { + color: #DE935F } .ace-tomorrow-night .ace_constant.ace_language { - color:#DE935F; + color: #DE935F } .ace-tomorrow-night .ace_constant.ace_numeric { - color:#DE935F; + color: #DE935F } .ace-tomorrow-night .ace_constant.ace_other { - color:#CED1CF; + color: #CED1CF } .ace-tomorrow-night .ace_invalid { - color:#CED2CF; -background-color:#DF5F5F; + color: #CED2CF; + background-color: #DF5F5F } .ace-tomorrow-night .ace_invalid.ace_deprecated { - color:#CED2CF; -background-color:#B798BF; + color: #CED2CF; + background-color: #B798BF } .ace-tomorrow-night .ace_support.ace_constant { - color:#DE935F; + color: #DE935F } .ace-tomorrow-night .ace_fold { - background-color: #81A2BE; - border-color: #C5C8C6; + background-color: #81A2BE; + border-color: #C5C8C6 } .ace-tomorrow-night .ace_support.ace_function { - color:#81A2BE; + color: #81A2BE } .ace-tomorrow-night .ace_support.ace_type { - color:#F0C674; + color: #F0C674 } .ace-tomorrow-night .ace_support.ace_class { - color:#F0C674; + color: #F0C674 } .ace-tomorrow-night .ace_storage { - color:#B294BB; + color: #B294BB } -.ace-tomorrow-night .ace_storage.ace_type, .ace-tomorrow-night .ace_support.ace_type { - color:#B294BB; +.ace-tomorrow-night .ace_storage.ace_type, +.ace-tomorrow-night .ace_support.ace_type { + color: #B294BB } .ace-tomorrow-night .ace_variable { - color:#81A2BE; + color: #81A2BE } .ace-tomorrow-night .ace_variable.ace_parameter { - color:#DE935F; + color: #DE935F } .ace-tomorrow-night .ace_string { - color:#B5BD68; + color: #B5BD68 } .ace-tomorrow-night .ace_string.ace_regexp { - color:#CC6666; + color: #CC6666 } .ace-tomorrow-night .ace_comment { - color:#969896; + color: #969896 } .ace-tomorrow-night .ace_variable { - color:#CC6666; + color: #CC6666 } .ace-tomorrow-night .ace_meta.ace_tag { - color:#CC6666; + color: #CC6666 } .ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name { - color:#CC6666; + color: #CC6666 } .ace-tomorrow-night .ace_entity.ace_name.ace_function { - color:#81A2BE; + color: #81A2BE +} + +.ace-tomorrow-night .ace_entity.ace_name.ace_tag { + color: #CC6666 } .ace-tomorrow-night .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-tomorrow-night .ace_markup.ace_heading { - color:#B5BD68; + color: #B5BD68 } .ace-tomorrow-night .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQlVf8z7Bq1ar/AA/hBFp7egmpAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQlVf8z7Bq1ar/AA/hBFp7egmpAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js index b943b414..f3fcdbc9 100644 --- a/lib/ace/theme/tomorrow_night.js +++ b/lib/ace/theme/tomorrow_night.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-tomorrow-night"; exports.cssText = require('ace/requirejs/text!./tomorrow_night.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index 17821602..d4fd912b 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -1,180 +1,189 @@ - .ace-tomorrow-night-blue .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-tomorrow-night-blue .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-tomorrow-night-blue .ace_gutter { background: #00204b; - color: #7388b5; + color: #7388b5 } .ace-tomorrow-night-blue .ace_print_margin { width: 1px; - background: #00204b; + background: #00204b } .ace-tomorrow-night-blue .ace_scroller { - background-color: #002451; + background-color: #002451 } .ace-tomorrow-night-blue .ace_text-layer { - color: #FFFFFF; + color: #FFFFFF } .ace-tomorrow-night-blue .ace_cursor { - border-left: 2px solid #FFFFFF; + border-left: 2px solid #FFFFFF } .ace-tomorrow-night-blue .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF } .ace-tomorrow-night-blue .ace_marker-layer .ace_selection { - background: #003F8E; + background: #003F8E } .ace-tomorrow-night-blue.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #002451; - border-radius: 2px; + border-radius: 2px } .ace-tomorrow-night-blue .ace_marker-layer .ace_step { - background: rgb(127, 111, 19); + background: rgb(127, 111, 19) } .ace-tomorrow-night-blue .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #404F7D; + border: 1px solid #404F7D } .ace-tomorrow-night-blue .ace_marker-layer .ace_active_line { - background: #00346E; + background: #00346E } .ace-tomorrow-night-blue .ace_gutter_active_line { - background-color: #022040; + background-color: #022040 } .ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word { - border: 1px solid #003F8E; + border: 1px solid #003F8E } .ace-tomorrow-night-blue .ace_invisible { - color: #404F7D; + color: #404F7D } -.ace-tomorrow-night-blue .ace_keyword, .ace-tomorrow-night-blue .ace_meta { - color:#EBBBFF; +.ace-tomorrow-night-blue .ace_keyword, +.ace-tomorrow-night-blue .ace_meta { + color: #EBBBFF } .ace-tomorrow-night-blue .ace_keyword.ace_operator { - color:#99FFFF; + color: #99FFFF } -.ace-tomorrow-night-blue .ace_constant.ace_character { - color:#FFC58F; +.ace-tomorrow-night-blue .ace_keyword.ace_other.ace_unit { + color: #FFC58F +} + +.ace-tomorrow-night-blue .ace_constant.ace_character { + color: #FFC58F } .ace-tomorrow-night-blue .ace_constant.ace_language { - color:#FFC58F; + color: #FFC58F } .ace-tomorrow-night-blue .ace_constant.ace_numeric { - color:#FFC58F; + color: #FFC58F } .ace-tomorrow-night-blue .ace_constant.ace_other { - color:#FFFFFF; + color: #FFFFFF } .ace-tomorrow-night-blue .ace_invalid { - color:#FFFFFF; -background-color:#F99DA5; + color: #FFFFFF; + background-color: #F99DA5 } .ace-tomorrow-night-blue .ace_invalid.ace_deprecated { - color:#FFFFFF; -background-color:#EBBBFF; + color: #FFFFFF; + background-color: #EBBBFF } .ace-tomorrow-night-blue .ace_support.ace_constant { - color:#FFC58F; + color: #FFC58F } .ace-tomorrow-night-blue .ace_fold { - background-color: #BBDAFF; - border-color: #FFFFFF; + background-color: #BBDAFF; + border-color: #FFFFFF } .ace-tomorrow-night-blue .ace_support.ace_function { - color:#BBDAFF; + color: #BBDAFF } .ace-tomorrow-night-blue .ace_support.ace_type { - color:#FFEEAD; + color: #FFEEAD } .ace-tomorrow-night-blue .ace_support.ace_class { - color:#FFEEAD; + color: #FFEEAD } .ace-tomorrow-night-blue .ace_storage { - color:#EBBBFF; + color: #EBBBFF } -.ace-tomorrow-night-blue .ace_storage.ace_type, .ace-tomorrow-night-blue .ace_support.ace_type { - color:#EBBBFF; +.ace-tomorrow-night-blue .ace_storage.ace_type, +.ace-tomorrow-night-blue .ace_support.ace_type { + color: #EBBBFF } .ace-tomorrow-night-blue .ace_variable { - color:#BBDAFF; + color: #BBDAFF } .ace-tomorrow-night-blue .ace_variable.ace_parameter { - color:#FFC58F; + color: #FFC58F } .ace-tomorrow-night-blue .ace_string { - color:#D1F1A9; + color: #D1F1A9 } .ace-tomorrow-night-blue .ace_string.ace_regexp { - color:#FF9DA4; + color: #FF9DA4 } .ace-tomorrow-night-blue .ace_comment { - color:#7285B7; + color: #7285B7 } .ace-tomorrow-night-blue .ace_variable { - color:#FF9DA4; + color: #FF9DA4 } .ace-tomorrow-night-blue .ace_meta.ace_tag { - color:#FF9DA4; + color: #FF9DA4 } .ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name { - color:#FF9DA4; + color: #FF9DA4 } .ace-tomorrow-night-blue .ace_entity.ace_name.ace_function { - color:#BBDAFF; + color: #BBDAFF +} + +.ace-tomorrow-night-blue .ace_entity.ace_name.ace_tag { + color: #FF9DA4 } .ace-tomorrow-night-blue .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-tomorrow-night-blue .ace_markup.ace_heading { - color:#D1F1A9; + color: #D1F1A9 } .ace-tomorrow-night-blue .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgUAn8z7Bq1ar/ABBUBHJ4/r3JAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgUAn8z7Bq1ar/ABBUBHJ4/r3JAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js index e3874f09..0b496d20 100644 --- a/lib/ace/theme/tomorrow_night_blue.js +++ b/lib/ace/theme/tomorrow_night_blue.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-tomorrow-night-blue"; exports.cssText = require('ace/requirejs/text!./tomorrow_night_blue.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index f200e37a..f220d61d 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -1,180 +1,189 @@ - .ace-tomorrow-night-bright .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-tomorrow-night-bright .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-tomorrow-night-bright .ace_gutter { background: #1a1a1a; - color: #DEDEDE; + color: #DEDEDE } .ace-tomorrow-night-bright .ace_print_margin { width: 1px; - background: #1a1a1a; + background: #1a1a1a } .ace-tomorrow-night-bright .ace_scroller { - background-color: #000000; + background-color: #000000 } .ace-tomorrow-night-bright .ace_text-layer { - color: #DEDEDE; + color: #DEDEDE } .ace-tomorrow-night-bright .ace_cursor { - border-left: 2px solid #9F9F9F; + border-left: 2px solid #9F9F9F } .ace-tomorrow-night-bright .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #9F9F9F; + border-bottom: 1px solid #9F9F9F } .ace-tomorrow-night-bright .ace_marker-layer .ace_selection { - background: #424242; + background: #424242 } .ace-tomorrow-night-bright.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #000000; - border-radius: 2px; + border-radius: 2px } .ace-tomorrow-night-bright .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-tomorrow-night-bright .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #343434; + border: 1px solid #343434 } .ace-tomorrow-night-bright .ace_marker-layer .ace_active_line { - background: #2A2A2A; + background: #2A2A2A } .ace-tomorrow-night-bright .ace_gutter_active_line { - background-color: #2A2A2A; + background-color: #2A2A2A } .ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word { - border: 1px solid #424242; + border: 1px solid #424242 } .ace-tomorrow-night-bright .ace_invisible { - color: #343434; + color: #343434 } -.ace-tomorrow-night-bright .ace_keyword, .ace-tomorrow-night-bright .ace_meta { - color:#C397D8; +.ace-tomorrow-night-bright .ace_keyword, +.ace-tomorrow-night-bright .ace_meta { + color: #C397D8 } .ace-tomorrow-night-bright .ace_keyword.ace_operator { - color:#70C0B1; + color: #70C0B1 } -.ace-tomorrow-night-bright .ace_constant.ace_character { - color:#E78C45; +.ace-tomorrow-night-bright .ace_keyword.ace_other.ace_unit { + color: #E78C45 +} + +.ace-tomorrow-night-bright .ace_constant.ace_character { + color: #E78C45 } .ace-tomorrow-night-bright .ace_constant.ace_language { - color:#E78C45; + color: #E78C45 } .ace-tomorrow-night-bright .ace_constant.ace_numeric { - color:#E78C45; + color: #E78C45 } .ace-tomorrow-night-bright .ace_constant.ace_other { - color:#EEEEEE; + color: #EEEEEE } .ace-tomorrow-night-bright .ace_invalid { - color:#CED2CF; -background-color:#DF5F5F; + color: #CED2CF; + background-color: #DF5F5F } .ace-tomorrow-night-bright .ace_invalid.ace_deprecated { - color:#CED2CF; -background-color:#B798BF; + color: #CED2CF; + background-color: #B798BF } .ace-tomorrow-night-bright .ace_support.ace_constant { - color:#E78C45; + color: #E78C45 } .ace-tomorrow-night-bright .ace_fold { - background-color: #7AA6DA; - border-color: #DEDEDE; + background-color: #7AA6DA; + border-color: #DEDEDE } .ace-tomorrow-night-bright .ace_support.ace_function { - color:#7AA6DA; + color: #7AA6DA } .ace-tomorrow-night-bright .ace_support.ace_type { - color:#E7C547; + color: #E7C547 } .ace-tomorrow-night-bright .ace_support.ace_class { - color:#E7C547; + color: #E7C547 } .ace-tomorrow-night-bright .ace_storage { - color:#C397D8; + color: #C397D8 } -.ace-tomorrow-night-bright .ace_storage.ace_type, .ace-tomorrow-night-bright .ace_support.ace_type { - color:#C397D8; +.ace-tomorrow-night-bright .ace_storage.ace_type, +.ace-tomorrow-night-bright .ace_support.ace_type { + color: #C397D8 } .ace-tomorrow-night-bright .ace_variable { - color:#7AA6DA; + color: #7AA6DA } .ace-tomorrow-night-bright .ace_variable.ace_parameter { - color:#E78C45; + color: #E78C45 } .ace-tomorrow-night-bright .ace_string { - color:#B9CA4A; + color: #B9CA4A } .ace-tomorrow-night-bright .ace_string.ace_regexp { - color:#D54E53; + color: #D54E53 } .ace-tomorrow-night-bright .ace_comment { - color:#969896; + color: #969896 } .ace-tomorrow-night-bright .ace_variable { - color:#D54E53; + color: #D54E53 } .ace-tomorrow-night-bright .ace_meta.ace_tag { - color:#D54E53; + color: #D54E53 } .ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name { - color:#D54E53; + color: #D54E53 } .ace-tomorrow-night-bright .ace_entity.ace_name.ace_function { - color:#7AA6DA; + color: #7AA6DA +} + +.ace-tomorrow-night-bright .ace_entity.ace_name.ace_tag { + color: #D54E53 } .ace-tomorrow-night-bright .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-tomorrow-night-bright .ace_markup.ace_heading { - color:#B9CA4A; + color: #B9CA4A } .ace-tomorrow-night-bright .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGD4z7Bq1ar/AAz9A/2naJQKAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGD4z7Bq1ar/AAz9A/2naJQKAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js index 5f18ee44..18bc4aa9 100644 --- a/lib/ace/theme/tomorrow_night_bright.js +++ b/lib/ace/theme/tomorrow_night_bright.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-tomorrow-night-bright"; exports.cssText = require('ace/requirejs/text!./tomorrow_night_bright.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 6dfdbbd1..0f1dde95 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -1,176 +1,185 @@ - .ace-tomorrow-night-eighties .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-tomorrow-night-eighties .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-tomorrow-night-eighties .ace_gutter { background: #272727; - color: #CCC; + color: #CCC } .ace-tomorrow-night-eighties .ace_print_margin { width: 1px; - background: #272727; + background: #272727 } .ace-tomorrow-night-eighties .ace_scroller { - background-color: #2D2D2D; + background-color: #2D2D2D } .ace-tomorrow-night-eighties .ace_text-layer { - color: #CCCCCC; + color: #CCCCCC } .ace-tomorrow-night-eighties .ace_cursor { - border-left: 2px solid #CCCCCC; + border-left: 2px solid #CCCCCC } .ace-tomorrow-night-eighties .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid #CCCCCC } .ace-tomorrow-night-eighties .ace_marker-layer .ace_selection { - background: #515151; + background: #515151 } .ace-tomorrow-night-eighties.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #2D2D2D; - border-radius: 2px; + border-radius: 2px } .ace-tomorrow-night-eighties .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #6A6A6A; + border: 1px solid #6A6A6A } .ace-tomorrow-night-eighties .ace_marker-layer .ace_active_line { - background: #393939; + background: #393939 } .ace-tomorrow-night-eighties .ace_gutter_active_line { - background-color: #393939; + background-color: #393939 } .ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word { - border: 1px solid #515151; + border: 1px solid #515151 } .ace-tomorrow-night-eighties .ace_invisible { - color: #6A6A6A; + color: #6A6A6A } -.ace-tomorrow-night-eighties .ace_keyword, .ace-tomorrow-night-eighties .ace_meta { - color:#CC99CC; +.ace-tomorrow-night-eighties .ace_keyword, +.ace-tomorrow-night-eighties .ace_meta { + color: #CC99CC } .ace-tomorrow-night-eighties .ace_keyword.ace_operator { - color:#66CCCC; + color: #66CCCC } -.ace-tomorrow-night-eighties .ace_constant.ace_character { - color:#F99157; +.ace-tomorrow-night-eighties .ace_keyword.ace_other.ace_unit { + color: #F99157 +} + +.ace-tomorrow-night-eighties .ace_constant.ace_character { + color: #F99157 } .ace-tomorrow-night-eighties .ace_constant.ace_language { - color:#F99157; + color: #F99157 } .ace-tomorrow-night-eighties .ace_constant.ace_numeric { - color:#F99157; + color: #F99157 } .ace-tomorrow-night-eighties .ace_constant.ace_other { - color:#CCCCCC; + color: #CCCCCC } .ace-tomorrow-night-eighties .ace_invalid { - color:#CDCDCD; -background-color:#F2777A; + color: #CDCDCD; + background-color: #F2777A } .ace-tomorrow-night-eighties .ace_invalid.ace_deprecated { - color:#CDCDCD; -background-color:#CC99CC; + color: #CDCDCD; + background-color: #CC99CC } .ace-tomorrow-night-eighties .ace_support.ace_constant { - color:#F99157; + color: #F99157 } .ace-tomorrow-night-eighties .ace_fold { - background-color: #6699CC; - border-color: #CCCCCC; + background-color: #6699CC; + border-color: #CCCCCC } .ace-tomorrow-night-eighties .ace_support.ace_function { - color:#6699CC; + color: #6699CC } .ace-tomorrow-night-eighties .ace_support.ace_type { - color:#FFCC66; + color: #FFCC66 } .ace-tomorrow-night-eighties .ace_support.ace_class { - color:#FFCC66; + color: #FFCC66 } .ace-tomorrow-night-eighties .ace_storage { - color:#CC99CC; + color: #CC99CC } -.ace-tomorrow-night-eighties .ace_storage.ace_type, .ace-tomorrow-night-eighties .ace_support.ace_type { - color:#CC99CC; +.ace-tomorrow-night-eighties .ace_storage.ace_type, +.ace-tomorrow-night-eighties .ace_support.ace_type { + color: #CC99CC } .ace-tomorrow-night-eighties .ace_variable { - color:#6699CC; + color: #6699CC } .ace-tomorrow-night-eighties .ace_variable.ace_parameter { - color:#F99157; + color: #F99157 } .ace-tomorrow-night-eighties .ace_string { - color:#99CC99; + color: #99CC99 } .ace-tomorrow-night-eighties .ace_comment { - color:#999999; + color: #999999 } .ace-tomorrow-night-eighties .ace_variable { - color:#F2777A; + color: #F2777A } .ace-tomorrow-night-eighties .ace_meta.ace_tag { - color:#F2777A; + color: #F2777A } .ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name { - color:#F2777A; + color: #F2777A } .ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function { - color:#6699CC; + color: #6699CC +} + +.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_tag { + color: #F2777A } .ace-tomorrow-night-eighties .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-tomorrow-night-eighties .ace_markup.ace_heading { - color:#99CC99; + color: #99CC99 } .ace-tomorrow-night-eighties .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ1dX9z7Bq1ar/ABE1BITwhhuFAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ1dX9z7Bq1ar/ABE1BITwhhuFAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js index fff11892..8217cdbd 100644 --- a/lib/ace/theme/tomorrow_night_eighties.js +++ b/lib/ace/theme/tomorrow_night_eighties.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-tomorrow-night-eighties"; exports.cssText = require('ace/requirejs/text!./tomorrow_night_eighties.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index 70794da6..924efb72 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -1,166 +1,169 @@ - .ace-twilight .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-twilight .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-twilight .ace_gutter { background: #232323; - color: #E2E2E2; + color: #E2E2E2 } .ace-twilight .ace_print_margin { width: 1px; - background: #232323; + background: #232323 } .ace-twilight .ace_scroller { - background-color: #141414; + background-color: #141414 } .ace-twilight .ace_text-layer { - color: #F8F8F8; + color: #F8F8F8 } .ace-twilight .ace_cursor { - border-left: 2px solid #A7A7A7; + border-left: 2px solid #A7A7A7 } .ace-twilight .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #A7A7A7; + border-bottom: 1px solid #A7A7A7 } .ace-twilight .ace_marker-layer .ace_selection { - background: rgba(221, 240, 255, 0.20); + background: rgba(221, 240, 255, 0.20) } .ace-twilight.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #141414; - border-radius: 2px; + border-radius: 2px } .ace-twilight .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-twilight .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid rgba(255, 255, 255, 0.25); + border: 1px solid rgba(255, 255, 255, 0.25) } .ace-twilight .ace_marker-layer .ace_active_line { - background: rgba(255, 255, 255, 0.031); + background: rgba(255, 255, 255, 0.031) } .ace-twilight .ace_gutter_active_line { - background-color: rgba(255, 255, 255, 0.031); + background-color: rgba(255, 255, 255, 0.031) } .ace-twilight .ace_marker-layer .ace_selected_word { - border: 1px solid rgba(221, 240, 255, 0.20); + border: 1px solid rgba(221, 240, 255, 0.20) } .ace-twilight .ace_invisible { - color: rgba(255, 255, 255, 0.25); + color: rgba(255, 255, 255, 0.25) } -.ace-twilight .ace_keyword, .ace-twilight .ace_meta { - color:#CDA869; +.ace-twilight .ace_keyword, +.ace-twilight .ace_meta { + color: #CDA869 } -.ace-twilight .ace_constant, .ace-twilight .ace_constant.ace_other { - color:#CF6A4C; +.ace-twilight .ace_constant, +.ace-twilight .ace_constant.ace_other { + color: #CF6A4C } -.ace-twilight .ace_constant.ace_character, { - color:#CF6A4C; +.ace-twilight .ace_constant.ace_character, + { + color: #CF6A4C } -.ace-twilight .ace_constant.ace_character.ace_escape, { - color:#CF6A4C; +.ace-twilight .ace_constant.ace_character.ace_escape, + { + color: #CF6A4C } .ace-twilight .ace_invalid.ace_illegal { - color:#F8F8F8; -background-color:rgba(86, 45, 86, 0.75); + color: #F8F8F8; + background-color: rgba(86, 45, 86, 0.75) } .ace-twilight .ace_invalid.ace_deprecated { - text-decoration:underline; -font-style:italic; -color:#D2A8A1; + text-decoration: underline; + font-style: italic; + color: #D2A8A1 } .ace-twilight .ace_support { - color:#9B859D; + color: #9B859D } .ace-twilight .ace_support.ace_constant { - color:#CF6A4C; + color: #CF6A4C } .ace-twilight .ace_fold { - background-color: #AC885B; - border-color: #F8F8F8; + background-color: #AC885B; + border-color: #F8F8F8 } .ace-twilight .ace_support.ace_function { - color:#DAD085; + color: #DAD085 } .ace-twilight .ace_storage { - color:#F9EE98; + color: #F9EE98 } .ace-twilight .ace_variable { - color:#AC885B; + color: #AC885B } .ace-twilight .ace_string { - color:#8F9D6A; + color: #8F9D6A } .ace-twilight .ace_string.ace_regexp { - color:#E9C062; + color: #E9C062 } .ace-twilight .ace_comment { - font-style:italic; -color:#5F5A60; + font-style: italic; + color: #5F5A60 } .ace-twilight .ace_variable { - color:#7587A6; + color: #7587A6 } .ace-twilight .ace_xml_pe { - color:#494949; + color: #494949 } .ace-twilight .ace_meta.ace_tag { - color:#AC885B; + color: #AC885B } .ace-twilight .ace_entity.ace_name.ace_function { - color:#AC885B; + color: #AC885B } .ace-twilight .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-twilight .ace_markup.ace_heading { - color:#CF6A4C; + color: #CF6A4C } .ace-twilight .ace_markup.ace_list { - color:#F9EE98; + color: #F9EE98 } .ace-twilight .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERH5zzBz5sz/AA5EBAYqeZXWAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERH5zzBz5sz/AA5EBAYqeZXWAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 766ba9b3..5c1d3eef 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-twilight"; exports.cssText = require('ace/requirejs/text!./twilight.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css index 08993a63..275931d6 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -1,145 +1,148 @@ - .ace-vibrant-ink .ace_editor { - border: 2px solid rgb(159, 159, 159); + border: 2px solid rgb(159, 159, 159) } .ace-vibrant-ink .ace_editor.ace_focus { - border: 2px solid #327fbd; + border: 2px solid #327fbd } .ace-vibrant-ink .ace_gutter { background: #1a1a1a; - color: #BEBEBE; + color: #BEBEBE } .ace-vibrant-ink .ace_print_margin { width: 1px; - background: #1a1a1a; + background: #1a1a1a } .ace-vibrant-ink .ace_scroller { - background-color: #0F0F0F; + background-color: #0F0F0F } .ace-vibrant-ink .ace_text-layer { - color: #FFFFFF; + color: #FFFFFF } .ace-vibrant-ink .ace_cursor { - border-left: 2px solid #FFFFFF; + border-left: 2px solid #FFFFFF } .ace-vibrant-ink .ace_cursor.ace_overwrite { border-left: 0px; - border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF } .ace-vibrant-ink .ace_marker-layer .ace_selection { - background: #6699CC; + background: #6699CC } .ace-vibrant-ink.multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #0F0F0F; - border-radius: 2px; + border-radius: 2px } .ace-vibrant-ink .ace_marker-layer .ace_step { - background: rgb(102, 82, 0); + background: rgb(102, 82, 0) } .ace-vibrant-ink .ace_marker-layer .ace_bracket { margin: -1px 0 0 -1px; - border: 1px solid #404040; + border: 1px solid #404040 } .ace-vibrant-ink .ace_marker-layer .ace_active_line { - background: #333333; + background: #333333 } .ace-vibrant-ink .ace_gutter_active_line { - background-color: #333333; + background-color: #333333 } .ace-vibrant-ink .ace_marker-layer .ace_selected_word { - border: 1px solid #6699CC; + border: 1px solid #6699CC } .ace-vibrant-ink .ace_invisible { - color: #404040; + color: #404040 } -.ace-vibrant-ink .ace_keyword, .ace-vibrant-ink .ace_meta { - color:#FF6600; +.ace-vibrant-ink .ace_keyword, +.ace-vibrant-ink .ace_meta { + color: #FF6600 } -.ace-vibrant-ink .ace_constant, .ace-vibrant-ink .ace_constant.ace_other { - color:#339999; +.ace-vibrant-ink .ace_constant, +.ace-vibrant-ink .ace_constant.ace_other { + color: #339999 } -.ace-vibrant-ink .ace_constant.ace_character, { - color:#339999; +.ace-vibrant-ink .ace_constant.ace_character, + { + color: #339999 } -.ace-vibrant-ink .ace_constant.ace_character.ace_escape, { - color:#339999; +.ace-vibrant-ink .ace_constant.ace_character.ace_escape, + { + color: #339999 } .ace-vibrant-ink .ace_constant.ace_numeric { - color:#99CC99; + color: #99CC99 } .ace-vibrant-ink .ace_invalid { - color:#CCFF33; -background-color:#000000; + color: #CCFF33; + background-color: #000000 } .ace-vibrant-ink .ace_invalid.ace_deprecated { - color:#CCFF33; -background-color:#000000; + color: #CCFF33; + background-color: #000000 } .ace-vibrant-ink .ace_fold { - background-color: #FFCC00; - border-color: #FFFFFF; + background-color: #FFCC00; + border-color: #FFFFFF } .ace-vibrant-ink .ace_support.ace_function { - color:#FFCC00; + color: #FFCC00 } .ace-vibrant-ink .ace_variable { - color:#FFCC00; + color: #FFCC00 } .ace-vibrant-ink .ace_variable.ace_parameter { - font-style:italic; + font-style: italic } .ace-vibrant-ink .ace_string { - color:#66FF00; + color: #66FF00 } .ace-vibrant-ink .ace_string.ace_regexp { - color:#44B4CC; + color: #44B4CC } .ace-vibrant-ink .ace_comment { - color:#9933CC; + color: #9933CC } .ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name { - font-style:italic; -color:#99CC99; + font-style: italic; + color: #99CC99 } .ace-vibrant-ink .ace_entity.ace_name.ace_function { - color:#FFCC00; + color: #FFCC00 } .ace-vibrant-ink .ace_markup.ace_underline { - text-decoration:underline; + text-decoration: underline } .ace-vibrant-ink .ace_indent-guide { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPg5+f/z7Bq1ar/AA5lBCqoLxsgAAAAAElFTkSuQmCC) right repeat-y; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPg5+f/z7Bq1ar/AA5lBCqoLxsgAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js index 28bd0496..584f8d29 100644 --- a/lib/ace/theme/vibrant_ink.js +++ b/lib/ace/theme/vibrant_ink.js @@ -34,6 +34,6 @@ exports.isDark = true; exports.cssClass = "ace-vibrant-ink"; exports.cssText = require('ace/requirejs/text!./vibrant_ink.css'); - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText, exports.cssClass); +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); }); diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css new file mode 100644 index 00000000..3a6e81b8 --- /dev/null +++ b/lib/ace/theme/xcode.css @@ -0,0 +1,144 @@ +.ace-xcode .ace_editor { + border: 2px solid rgb(159, 159, 159) +} + +/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: EE3AD170-2B7F-4DE1-B724-C75F13FE0085) */ + +.ace-xcode .ace_editor { + border: 2px solid rgb(159, 159, 159) +} + +.ace-xcode .ace_editor.ace_focus { + border: 2px solid #327fbd +} + +.ace-xcode .ace_gutter { + background: #e8e8e8; + color: #333 +} + +.ace-xcode .ace_print_margin { + width: 1px; + background: #e8e8e8 +} + +.ace-xcode .ace_scroller { + background-color: #FFFFFF +} + +.ace-xcode .ace_text-layer { + color: #000000 +} + +.ace-xcode .ace_cursor { + border-left: 2px solid #000000 +} + +.ace-xcode .ace_cursor.ace_overwrite { + border-left: 0px; + border-bottom: 1px solid #000000 +} + +.ace-xcode .ace_marker-layer .ace_selection { + background: #B5D5FF +} + +.ace-xcode.multiselect .ace_selection.start { + box-shadow: 0 0 3px 0px #FFFFFF; + border-radius: 2px +} + +.ace-xcode .ace_marker-layer .ace_step { + background: rgb(198, 219, 174) +} + +.ace-xcode .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px; + border: 1px solid #BFBFBF +} + +.ace-xcode .ace_marker-layer .ace_active_line { + background: rgba(0, 0, 0, 0.071) +} + +.ace-xcode .ace_gutter_active_line { + background-color: rgba(0, 0, 0, 0.071) +} + +.ace-xcode .ace_marker-layer .ace_selected_word { + border: 1px solid #B5D5FF +} + +.ace-xcode .ace_invisible { + color: #BFBFBF +} + +.ace-xcode .ace_keyword, +.ace-xcode .ace_meta { + color: #C800A4 +} + +.ace-xcode .ace_constant.ace_character { + color: #275A5E +} + +.ace-xcode .ace_constant.ace_language { + color: #C800A4 +} + +.ace-xcode .ace_constant.ace_numeric { + color: #3A00DC +} + +.ace-xcode .ace_constant.ace_other { + color: #275A5E +} + +.ace-xcode .ace_support.ace_constant { + color: #450084 +} + +.ace-xcode .ace_fold { + background-color: #C800A4; + border-color: #000000 +} + +.ace-xcode .ace_support.ace_function { + color: #450084 +} + +.ace-xcode .ace_support.ace_type { + color: #790EAD +} + +.ace-xcode .ace_support.ace_class { + color: #790EAD +} + +.ace-xcode .ace_storage { + color: #C900A4 +} + +.ace-xcode .ace_string { + color: #DF0002 +} + +.ace-xcode .ace_comment { + color: #008E00 +} + +.ace-xcode .ace_variable.ace_language { + color: #C800A4 +} + +.ace-xcode .ace_entity.ace_other.ace_attribute-name { + color: #450084 +} + +.ace-xcode .ace_entity.ace_name.ace_tag { + color: #790EAD +} + +.ace-xcode .ace_markup.ace_underline { + text-decoration: underline +} \ No newline at end of file diff --git a/lib/ace/theme/xcode.js b/lib/ace/theme/xcode.js new file mode 100644 index 00000000..c6cba5b9 --- /dev/null +++ b/lib/ace/theme/xcode.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-xcode"; +exports.cssText = require('ace/requirejs/text!./xcode.css'); + +var dom = require("../lib/dom"); +dom.importCssString(exports.cssText, exports.cssClass); +}); diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 8b52ef83..d477c8df 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -77,6 +77,10 @@ %keyword.operator% } +.%cssClass% .ace_keyword.ace_other.ace_unit { + %keyword.other.unit% +} + .%cssClass% .ace_constant, .%cssClass% .ace_constant.ace_other { %constant% } @@ -89,6 +93,10 @@ %constant.character.escape% } +.%cssClass% .ace_constant.ace_character.ace_entity { + %constant.character.entity% +} + .%cssClass% .ace_constant.ace_language { %constant.language% } @@ -105,6 +113,10 @@ %constant.other% } +.%cssClass% .ace_constant.ace_other.ace_color { + %constant.other.color% +} + .%cssClass% .ace_invalid { %invalid% } @@ -125,6 +137,10 @@ %support.constant% } +.%cssClass% support.constant.property-value { + %support.constant.property-value% +} + .%cssClass% .ace_fold { background-color: %fold%; border-color: %foreground%; @@ -210,6 +226,10 @@ %ace.meta.tag.input% } +.%cssClass% .ace_meta.ace_selector { + %meta.selector% +} + .%cssClass% .ace_entity.ace_other.ace_attribute-name { %entity.other.attribute-name% } @@ -222,6 +242,14 @@ %entity.name.function% } +.%cssClass% .ace_entity.ace_other.ace_inherited-class { + %entity.other.inherited-class% +} + +.%cssClass% .ace_entity.ace_name.ace_tag { + %entity.name.tag% +} + .%cssClass% .ace_markup.ace_underline { text-decoration:underline; } diff --git a/tool/package.json b/tool/package.json index c576aff2..a96e830d 100644 --- a/tool/package.json +++ b/tool/package.json @@ -2,6 +2,8 @@ "name": "ace-tools", "version": "0.1.0", "dependencies": { - "plist": "" + "plist": "", + "css-parse": "", + "css-stringify": "" } } diff --git a/tool/tmtheme.js b/tool/tmtheme.js index fca5453b..06484d48 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -1,4 +1,8 @@ var fs = require("fs"); +var path = require("path"); +var util = require("util"); +var cssParse = require("css-parse"); +var cssStringify = require("css-stringify"); var parseString = require("plist").parseString; function parseTheme(themeXml, callback) { @@ -7,9 +11,12 @@ function parseTheme(themeXml, callback) { }); } +var unsupportedScopes = { }; + var supportedScopes = { "keyword": "keyword", "keyword.operator": "keyword.operator", + "keyword.other.unit": "keyword.other.unit", "constant": "constant", "constant.language": "constant.language", @@ -17,6 +24,7 @@ var supportedScopes = { "constant.numeric": "constant.numeric", "constant.character" : "constant.character", "constant.character.escape" : "constant.character.escape", + "constant.character.entity": "constant.character.entity", "constant.other" : "constant.other", "support": "support", @@ -25,6 +33,7 @@ var supportedScopes = { "support.function.firebug": "support.firebug", "support.function.constant": "support.function.constant", "support.constant": "support.constant", + "support.constant.property-value": "support.constant.property-value", "support.class": "support.class", "support.type": "support.type", "support.other": "support.other", @@ -53,11 +62,12 @@ var supportedScopes = { "meta": "meta", "meta.tag.sgml.doctype": "xml_pe", "meta.tag": "meta.tag", - "meta.tag.form": "meta.tag.form", - + "meta.selector": "meta.selector", + "entity.other.attribute-name": "entity.other.attribute-name", "entity.name.function": "entity.name.function", "entity.name": "entity.name", + "entity.name.tag": "entity.name.tag", "markup.heading": "markup.heading", "markup.heading.1": "markup.heading.1", @@ -68,7 +78,9 @@ var supportedScopes = { "markup.heading.6": "markup.heading.6", "markup.list": "markup.list", - "collab.user1": "collab.user1" + "collab.user1": "collab.user1", + + "text": "text" }; function extractStyles(theme) { @@ -90,23 +102,35 @@ function extractStyles(theme) { }; for (var i=1; i 0) { + if (unsupportedScopes[scope] === undefined) { + unsupportedScopes[scope] = 1; + } + else { + unsupportedScopes[scope] = unsupportedScopes[scope] + 1; + } } + } } - if (!colors.fold) - colors.fold = ((colors["entity.name.function"] || colors.keyword).match(/\:([^;]+)/)||[])[1]; - + if (!colors.fold) { + var foldSource = colors["entity.name.function"] || colors.keyword; + if (foldSource) { + colors.fold = foldSource.match(/\:([^;]+)/)[1]; + } + } + if (!colors.selected_word_highlight) colors.selected_word_highlight = "border: 1px solid " + colors.selection + ";"; @@ -178,15 +202,15 @@ var cssTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.css", "utf8"); var jsTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.js", "utf8"); var themes = { - //"chrome": "Chrome", + "chrome": "Chrome DevTools", "clouds": "Clouds", "clouds_midnight": "Clouds Midnight", "cobalt": "Cobalt", //"crimson_editor": "Crimson Editor", "dawn": "Dawn", - //"dreamweaver": "Dreamweaver", + "dreamweaver": "Dreamweaver", //"eclipse": "Eclipse", - //"github": "GitHub", + "github": "GitHub", "idle_fingers": "idleFingers", "kr_theme": "krTheme", "merbivore": "Merbivore", @@ -196,14 +220,15 @@ var themes = { "pastel_on_dark": "Pastels on Dark", "solarized_dark": "Solarized-dark", "solarized_light": "Solarized-light", - //"textmate": "Textmate", + //"textmate": "Textmate (Mac Classic)", "tomorrow": "Tomorrow", "tomorrow_night": "Tomorrow-Night", "tomorrow_night_blue": "Tomorrow-Night-Blue", "tomorrow_night_bright": "Tomorrow-Night-Bright", "tomorrow_night_eighties": "Tomorrow-Night-Eighties", "twilight": "Twilight", - "vibrant_ink": "Vibrant Ink" + "vibrant_ink": "Vibrant Ink", + "xcode": "Xcode_default" }; function convertTheme(name) { @@ -224,10 +249,57 @@ function convertTheme(name) { isDark: styles.isDark }); + // we're going to look for NEW rules in the parsed content only + // if such a rule exists, add it to the destination file + // this way, we preserve all hand-modified rules in the .css rules, + // (because some exist, for collab1 and ace_indentation_guide + try { + var outThemeCss = fs.readFileSync(__dirname + "/../lib/ace/theme/" + name + ".css"); + var parsedExistingFile = cssParse(outThemeCss); + var parsedPotentialFile = cssParse(css); + + + for (var r = 0; r < parsedPotentialFile.stylesheet.rules.length; r++) { + var potentialSelectors = parsedPotentialFile.stylesheet.rules[r].selectors; + var found = false; + + for (var e = 0; e < parsedExistingFile.stylesheet.rules.length; e++) { + var existingSelectors = parsedExistingFile.stylesheet.rules[e].selectors; + + if (existingSelectors.join(",") === potentialSelectors.join(",")) { + found = true; + break; + } + } + if (!found) { + console.log("Adding NEW rule: ", parsedPotentialFile.stylesheet.rules[r]) + parsedExistingFile.stylesheet.rules.splice(r, 0, parsedPotentialFile.stylesheet.rules[r]); + } + } + css = cssStringify(parsedExistingFile, { compress: false }); + } catch(e) { + console.log("Creating new file: " + name + ".css") + } + fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".js", js); fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".css", css); }) } -for (var name in themes) - convertTheme(name); \ No newline at end of file +for (var name in themes) { + convertTheme(name); +} + +var sortedUnsupportedScopes = {}; +for (var u in unsupportedScopes) { + var value = unsupportedScopes[u]; + if (sortedUnsupportedScopes[value] === undefined) { + sortedUnsupportedScopes[value] = []; + } + sortedUnsupportedScopes[value].push(u); +} + +console.log("I found these unsupported scopes:"); +console.log(sortedUnsupportedScopes); +console.log("It's safe to ignore these, but they may affect your syntax highlighting if your mode depends on any of these rules."); +console.log("Refer to the docs on ace.ajax.org for information on how to add a scope to the CSS generator."); \ No newline at end of file diff --git a/tool/tmthemes/Chrome DevTools.tmTheme b/tool/tmthemes/Chrome DevTools.tmTheme new file mode 100644 index 00000000..8f14e4fa --- /dev/null +++ b/tool/tmthemes/Chrome DevTools.tmTheme @@ -0,0 +1,294 @@ + + + + + author + Austin Cummings + name + Chrome DevTools + settings + + + settings + + background + #FFFFFF + caret + #000000 + foreground + #000000 + invisibles + #B3B3B3F4 + lineHighlight + #0000001A + selection + #BAD6FD + + + + name + String + scope + string + settings + + foreground + #C41A16 + + + + name + Number + scope + constant.numeric + settings + + foreground + #1C00CF + + + + name + Keyword + scope + keyword + settings + + foreground + #AA0D91 + + + + name + Operator + scope + keyword.operator + settings + + foreground + #000000 + + + + name + Identifier + scope + constant.language + settings + + foreground + #AA0D91 + + + + name + Exception + scope + support.class.exception + settings + + foreground + #990000 + + + + name + Function name + scope + entity.name.function + settings + + foreground + #000000 + + + + + name + Type name + scope + entity.name.type + settings + + fontStyle + bold underline + + + + name + Arguments + scope + variable.parameter + settings + + fontStyle + italic + + + + name + Comment + scope + comment + settings + + + foreground + #007400 + + + + name + Invalid + scope + invalid + settings + + + foreground + #FF0000 + + + + name + Trailing whitespace + scope + invalid.deprecated.trailing-whitespace + settings + + background + #E71A1100 + + + + name + Embedded source + scope + text source + settings + + background + #FAFAFAFC + foreground + #000000 + + + + name + Tag + scope + meta.tag, declaration.tag + settings + + foreground + #AA0D91 + + + + + name + Support + scope + support + settings + + fontStyle + bold + foreground + #000000 + + + + name + Storage + scope + storage + settings + + + foreground + #AA0D91 + + + + name + Section name + scope + entity.name.section + settings + + fontStyle + bold underline + + + + name + Frame title + scope + entity.name.function.frame + settings + + fontStyle + bold + foreground + #000000 + + + + + name + XML Declaration + scope + meta.tag.preprocessor.xml + settings + + foreground + #333333 + + + + name + Tag Attribute + scope + entity.other.attribute-name + settings + + fontStyle + italic + foreground + + #994500 + + + + name + Tag Name + scope + entity.name.tag + settings + + foreground + #881280 + + + + + uuid + 4FCFA210-B247-11D9-9D00-000D93347A42 + + diff --git a/tool/tmthemes/Dreamweaver.tmTheme b/tool/tmthemes/Dreamweaver.tmTheme new file mode 100644 index 00000000..466863af --- /dev/null +++ b/tool/tmthemes/Dreamweaver.tmTheme @@ -0,0 +1,521 @@ + + + + + comment + By Jim Isaacs - jimisaacs.com + name + Dreamweaver + settings + + + settings + + background + #FFFFFF + caret + #000000 + foreground + #000000 + invisibles + #BFBFBF + lineHighlight + #00000012 + selection + #5EA0FF + + + + name + text + scope + text + settings + + foreground + #000000 + + + + name + constant numeric + scope + constant.numeric - source.css + settings + + fontStyle + + foreground + #EE000B + + + + name + comment general + scope + comment + settings + + fontStyle + + foreground + #9A9A9A + + + + name + html meta + scope + text.html meta.tag + settings + + fontStyle + + foreground + #00359E + + + + name + html string + scope + text.html.basic meta.tag string.quoted - source + settings + + foreground + #001EFF + + + + name + html contstant + scope + text.html.basic constant.character.entity.html + settings + + fontStyle + bold + foreground + #000000 + + + + name + html a tag + scope + text.html meta.tag.a - string + settings + + fontStyle + + foreground + #106800 + + + + name + html img tag + scope + text.html meta.tag.img - string + settings + + foreground + #6D232E + + + + name + html form tag + scope + text.html meta.tag.form - string + settings + + foreground + #FF9700 + + + + name + html table + scope + text.html meta.tag.table - string + settings + + foreground + #009079 + + + + name + js embedded + scope + source.js.embedded.html punctuation.definition.tag - source.php, source.js.embedded.html entity.name.tag.script, source.js.embedded entity.other.attribute-name - source.js string + settings + + fontStyle + + foreground + #842B44 + + + + name + js comment + scope + source.js comment - source.php + settings + + foreground + #9A9A9A + + + + name + js meta function + scope + source.js meta.function - source.php + settings + + fontStyle + + foreground + #000000 + + + + name + js instance / support.function + scope + source.js meta.class - source.php, source.js support.function - source.php + settings + + foreground + #24C696 + + + + name + js string + scope + source.js string - source.php, source.js keyword.operator + settings + + fontStyle + + foreground + #0035FF + + + + name + js support + scope + source.js support.class + settings + + foreground + #7E00B7 + + + + name + js storage + scope + source.js storage + settings + + fontStyle + bold + foreground + #000000 + + + + name + js storage (not function) / bool / new / braces + scope + source.js storage - storage.type.function - source.php, source.js constant - source.php, source.js keyword - source.php, source.js variable.language, source.js meta.brace, source.js punctuation.definition.parameters.begin, source.js punctuation.definition.parameters.end + settings + + fontStyle + bold + foreground + #05208C + + + + name + js regexp + scope + source.js string.regexp, source.js string.regexp constant + settings + + foreground + #106800 + + + + name + css embedded + scope + source.css.embedded.html punctuation.definition.tag, source.css.embedded.html entity.name.tag.style, source.css.embedded entity.other.attribute-name - meta.selector + settings + + foreground + #8D00B7 + + + + name + css @import + scope + source.css meta.at-rule.import.css + settings + + fontStyle + bold + foreground + #009C7F + + + + name + css @important + scope + source.css keyword.other.important + settings + + fontStyle + bold + foreground + #EE000B + + + + name + css @media + scope + source.css meta.at-rule.media + settings + + fontStyle + bold + foreground + #430303 + + + + name + css string + scope + source.css string + settings + + foreground + #106800 + + + + name + css selector/prop-list + scope + source.css meta.selector, source.css meta.property-list, source.css meta.at-rule + settings + + foreground + #DA29FF + + + + name + css punctuation + scope + source.css punctuation.separator - source.php, source.css punctuation.terminator - source.php + settings + + fontStyle + bold + foreground + #DA29FF + + + + name + css property name + scope + source.css meta.property-name + settings + + foreground + #05208C + + + + name + css property value + scope + source.css meta.property-value + settings + + foreground + #0035FF + + + + name + php begin/end block + scope + source.php punctuation.section.embedded.begin, source.php punctuation.section.embedded.end + settings + + fontStyle + bold + foreground + #EE000B + + + + name + php + scope + source.php - punctuation.section + settings + + fontStyle + + foreground + #000000 + + + + name + php varaible + scope + source.php variable, source.php meta.function.arguments + settings + + foreground + #000000 + + + + name + php punctuation + scope + source.php punctuation - string - variable - meta.function + settings + + foreground + #05208C + + + + name + php storage.type + scope + source.php storage.type + settings + + foreground + #24BF96 + + + + name + php keyword general / storage misc + scope + source.php keyword - comment, source.php storage.type.class, source.php storage.type.interface, source.php storage.modifier, source.php constant.language + settings + + foreground + #009714 + + + + name + php support / storage / operator + scope + source.php support , source.php storage, source.php keyword.operator, source.php storage.type.function + settings + + foreground + #0035FF + + + + name + php varaible global + scope + source.php variable.other.global + settings + + foreground + #0092F2 + + + + name + php support constant + scope + source.php support.constant, source.php constant.language.php + settings + + foreground + #551D02 + + + + name + php string + scope + source.php string, source.php string keyword.operator + settings + + fontStyle + + foreground + #E20000 + + + + name + php string variable + scope + source.php string.quoted.double variable + settings + + foreground + #FF6200 + + + + name + php comment general + scope + source.php comment + settings + + foreground + #FF9404 + + + + name + Invalid + scope + invalid + settings + + background + #EFFF8A + fontStyle + bold + foreground + #EE000B + + + + uuid + 4C43099A-C325-4F56-BACB-F332209207B0 + + diff --git a/tool/tmthemes/GitHub.tmTheme b/tool/tmthemes/GitHub.tmTheme new file mode 100644 index 00000000..aa21abce --- /dev/null +++ b/tool/tmthemes/GitHub.tmTheme @@ -0,0 +1,573 @@ + + + + + author + Martin Kühl + comment + A theme based on the GitHub code stylesheet. + name + GitHub + settings + + + comment + +background #files .file .data background-color +caret #files .file .meta color +invisibles .syntax .w +lineHighlight #FFFEEB #files .file .private background-color + alt: #FFFFCC colour that gets added via javascript +selection #B4D5FE handmade :-) + alt: #FFFFCC colour that gets added via javascript + #EAF2F5 #header .userbox background-color + #EAEAEA #files .file background-color + #DEDEDE #files .file border-color + #F9EA86 Mac OS X system selection colour “Gold” + + settings + + background + #F8F8FF + caret + #666666 + foreground + #000000 + invisibles + #BBBBBB + lineHighlight + #FFFEEB + selection + #B4D5FE + + + + comment + .syntax .c, .syntax .c[ml] + name + Comment + scope + comment + settings + + fontStyle + italic + foreground + #999988 + + + + name + Comment.Preproc + scope + comment.block.preprocessor + settings + + comment + .syntax .cp + fontStyle + bold + foreground + #999999 + + + + name + Comment.Special + scope + comment.documentation, comment.block.documentation + settings + + comment + .syntax .cs + fontStyle + bold italic + foreground + #999999 + + + + name + Error + scope + invalid.illegal + settings + + background + #E3D2D2 + comment + .syntax .err + foreground + #A61717 + + + + comment + .syntax .k, .syntax .k[dpr] + name + Keyword + scope + keyword, storage + settings + + fontStyle + bold + + + + comment + .syntax .o, .syntax .ow + name + Operator + scope + keyword.operator + settings + + fontStyle + bold + + + + name + Keyword.Constant + scope + constant.language, support.constant + settings + + comment + .style .kc + fontStyle + bold + + + + name + Keyword.Type + scope + storage.type, support.type + settings + + comment + .style .kt + fontStyle + bold + foreground + #445588 + + + + name + Name.Attribute + scope + entity.other.attribute-name + settings + + comment + .style .na + foreground + #008080 + + + + name + Name.Builtin + scope + variable.other + settings + + comment + .style .nb + foreground + #0086B3 + + + + name + Name.Builtin.Pseudo + scope + variable.language + settings + + comment + .style .bp + foreground + #999999 + + + + comment + TODO: support.class is styled as Name.Constant on GitHub. + name + Name.Class + scope + entity.name.type, entity.other.inherited-class, support.class + settings + + comment + .style .nc + fontStyle + bold + foreground + #445588 + + + + name + Name.Constant + scope + variable.other.constant + settings + + comment + .style .no + foreground + #008080 + + + + name + Name.Entity + scope + constant.character.entity + settings + + comment + .style .ni + foreground + #800080 + + + + name + Name.Exception + scope + entity.name.exception + settings + + comment + .style .ne + foreground + #990000 + + + + name + Name.Function + scope + entity.name.function, support.function, keyword.other.name-of-parameter + settings + + comment + .style .nf + foreground + #990000 + + + + name + Name.Namespace + scope + entity.name.section + settings + + comment + .style .nn + foreground + #555555 + + + + name + Name.Tag + scope + entity.name.tag + settings + + comment + .style .nt + foreground + #000080 + + + + name + Name.Variable + scope + variable.parameter, support.variable + settings + + comment + .style .nv, .style .v[cgi] + foreground + #008080 + + + + name + Literal.Number + scope + constant.numeric, constant.other + settings + + comment + .style .m, .style .m[fhio], .style .il + foreground + #009999 + + + + name + Literal.String + scope + string - string source, constant.character + settings + + comment + .style .s[bcd2ehixl] + fontStyle + + foreground + #DD1144 + + + + name + Literal.String.Regex + scope + string.regexp + settings + + comment + .style .sr + foreground + #009926 + + + + name + Literal.String.Symbol + scope + constant.other.symbol + settings + + comment + .style .ss + foreground + #990073 + + + + name + Punctuation + scope + punctuation + settings + + fontStyle + bold + + + + name + Generic.Deleted + scope + markup.deleted + settings + + background + #FFDDDD + comment + .syntax .gd + foreground + #000000 + + + + name + Generic.Emph + scope + markup.italic + settings + + comment + .syntax .ge + fontStyle + italic + + + + name + Generic.Error + scope + markup.error + settings + + comment + .syntax .gr + foreground + #AA0000 + + + + name + Generic.Heading + scope + markup.heading.1 + settings + + comment + .syntax .gh + foreground + #999999 + + + + name + Generic.Inserted + scope + markup.inserted + settings + + background + #DDFFDD + comment + .syntax .gi + foreground + #000000 + + + + name + Generic.Output + scope + markup.output, markup.raw + settings + + comment + .syntax .go + foreground + #888888 + + + + name + Generic.Prompt + scope + markup.prompt + settings + + comment + .syntax .gp + foreground + #555555 + + + + name + Generic.Strong + scope + markup.bold + settings + + comment + .syntax .gs + fontStyle + bold + + + + name + Generic.Subheading + scope + markup.heading + settings + + comment + .syntax .gu + foreground + #AAAAAA + + + + name + Generic.Traceback + scope + markup.traceback + settings + + comment + .syntax .gt + foreground + #AA0000 + + + + name + Generic.Underline + scope + markup.underline + settings + + fontStyle + underline + + + + name + Extra: Diff Range + scope + meta.diff.range, meta.diff.index, meta.separator + settings + + background + #EAF2F5 + comment + .syntax .gc + foreground + #999999 + + + + name + Extra: Diff From + scope + meta.diff.header.from-file + settings + + background + #FFDDDD + foreground + #999999 + + + + name + Extra: Diff To + scope + meta.diff.header.to-file + settings + + background + #DDFFDD + foreground + #999999 + + + + name + Extra: Link + scope + meta.link + settings + + fontStyle + + foreground + #4183C4 + + + + uuid + FDD6F02A-74F7-4B6C-97F1-857D792EC90E + + diff --git a/tool/tmthemes/Xcode_default.tmTheme b/tool/tmthemes/Xcode_default.tmTheme new file mode 100644 index 00000000..c7b5072c --- /dev/null +++ b/tool/tmthemes/Xcode_default.tmTheme @@ -0,0 +1,240 @@ + + + + + comment + Carmine Paolino + name + Xcode default + settings + + + settings + + background + #FFFFFF + caret + #000000 + foreground + #000000 + invisibles + #BFBFBF + lineHighlight + #00000012 + selection + #B5D5FF + + + + name + Comment + scope + comment + settings + + foreground + #008E00 + + + + name + Preprocessor Statements + scope + meta.preprocessor, keyword.control.import + settings + + foreground + #7D4726 + + + + name + String + scope + string + settings + + foreground + #DF0002 + + + + name + Number + scope + constant.numeric + settings + + foreground + #3A00DC + + + + name + Built-in constant + scope + constant.language + settings + + foreground + #C800A4 + + + + name + User-defined constant + scope + constant.character, constant.other + settings + + foreground + #275A5E + + + + name + Variable + scope + variable.language, variable.other + settings + + foreground + #C800A4 + + + + name + Keyword + scope + keyword + settings + + foreground + #C800A4 + + + + name + Storage + scope + storage + settings + + foreground + #C900A4 + + + + name + Class name + scope + entity.name.class + settings + + foreground + #438288 + + + + name + Inherited class + scope + entity.other.inherited-class + settings + + + + name + Function name + scope + entity.name.function + settings + + + + name + Function argument + scope + variable.parameter + settings + + + + name + Tag name + scope + entity.name.tag + settings + + foreground + #790EAD + + + + name + Tag attribute + scope + entity.other.attribute-name + settings + + foreground + #450084 + + + + name + Library function + scope + support.function + settings + + foreground + #450084 + + + + name + Library constant + scope + support.constant + settings + + foreground + #450084 + + + + name + Library class/type + scope + support.type, support.class + settings + + foreground + #790EAD + + + + name + Library variable + scope + support.other.variable + settings + + foreground + #790EAD + + + + name + Invalid + scope + invalid + settings + + + + uuid + EE3AD170-2B7F-4DE1-B724-C75F13FE0085 + +