From 4017abd825293656505b56c3ba966c81edc76112 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Tue, 11 Sep 2012 17:05:36 -0700 Subject: [PATCH 1/6] Make updates to theme parser logic and tool --- tool/Theme.tmpl.css | 32 +++++++++++++- tool/package.json | 4 +- tool/tmtheme.js | 102 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 117 insertions(+), 21 deletions(-) diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 8b52ef83..6bb17908 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -77,18 +77,26 @@ %keyword.operator% } +.%cssClass% .ace_keyword.ace_other.ace_unit { + %keyword.other.unit% +} + .%cssClass% .ace_constant, .%cssClass% .ace_constant.ace_other { %constant% } -.%cssClass% .ace_constant.ace_character { +.%cssClass% .ace_constant.ace_character { %constant.character% } -.%cssClass% .ace_constant.ace_character.ace_escape { +.%cssClass% .ace_constant.ace_character.ace_escape { %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..81104f0e 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,6 +11,8 @@ function parseTheme(themeXml, callback) { }); } +var unsupportedScopes = { }; + var supportedScopes = { "keyword": "keyword", "keyword.operator": "keyword.operator", @@ -90,22 +96,34 @@ 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,7 +196,7 @@ 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", @@ -196,14 +214,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 +243,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 From 2e55b85a9745861db0ffa4cfe618d9c992f32647 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 18 Sep 2012 20:02:05 +0400 Subject: [PATCH 2/6] regenerate all themes --- lib/ace/theme/clouds.css | 67 +++++++------- lib/ace/theme/clouds.js | 4 +- lib/ace/theme/clouds_midnight.css | 70 ++++++++------- lib/ace/theme/clouds_midnight.js | 4 +- lib/ace/theme/cobalt.css | 89 ++++++++++--------- lib/ace/theme/cobalt.js | 4 +- lib/ace/theme/dawn.css | 97 +++++++++++---------- lib/ace/theme/dawn.js | 4 +- lib/ace/theme/idle_fingers.css | 85 +++++++++--------- lib/ace/theme/idle_fingers.js | 4 +- lib/ace/theme/kr_theme.css | 85 +++++++++--------- lib/ace/theme/kr_theme.js | 4 +- lib/ace/theme/merbivore.css | 91 ++++++++++--------- lib/ace/theme/merbivore.js | 4 +- lib/ace/theme/merbivore_soft.css | 97 +++++++++++---------- lib/ace/theme/merbivore_soft.js | 4 +- lib/ace/theme/mono_industrial.css | 93 ++++++++++---------- lib/ace/theme/mono_industrial.js | 4 +- lib/ace/theme/monokai.css | 99 ++++++++++----------- lib/ace/theme/monokai.js | 4 +- lib/ace/theme/pastel_on_dark.css | 97 +++++++++++---------- lib/ace/theme/pastel_on_dark.js | 4 +- lib/ace/theme/solarized_dark.css | 80 ++++++++--------- lib/ace/theme/solarized_dark.js | 4 +- lib/ace/theme/solarized_light.css | 78 ++++++++--------- lib/ace/theme/solarized_light.js | 4 +- lib/ace/theme/tomorrow.css | 101 +++++++++++----------- lib/ace/theme/tomorrow.js | 4 +- lib/ace/theme/tomorrow_night.css | 101 +++++++++++----------- lib/ace/theme/tomorrow_night.js | 4 +- lib/ace/theme/tomorrow_night_blue.css | 101 +++++++++++----------- lib/ace/theme/tomorrow_night_blue.js | 4 +- lib/ace/theme/tomorrow_night_bright.css | 101 +++++++++++----------- lib/ace/theme/tomorrow_night_bright.js | 4 +- lib/ace/theme/tomorrow_night_eighties.css | 99 ++++++++++----------- lib/ace/theme/tomorrow_night_eighties.js | 4 +- lib/ace/theme/twilight.css | 99 ++++++++++----------- lib/ace/theme/twilight.js | 4 +- lib/ace/theme/vibrant_ink.css | 87 ++++++++++--------- lib/ace/theme/vibrant_ink.js | 4 +- 40 files changed, 968 insertions(+), 929 deletions(-) diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index 3f33a7d7..16fac9c6 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -1,124 +1,129 @@ .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_constant.ace_language { - color:#39946A; + color: #39946A } .ace-clouds .ace_constant.ace_numeric { - color:#46A609; + color: #46A609 } .ace-clouds .ace_invalid { - background-color:#FF002A; + background-color: #FF002A } .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_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..6a5009aa 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -1,126 +1,130 @@ - .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_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 .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_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..d23d3aef 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -1,147 +1,150 @@ .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..0d14dbf3 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -1,153 +1,154 @@ - .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/idle_fingers.css b/lib/ace/theme/idle_fingers.css index 00e8a81e..ce7f926b 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -1,141 +1,142 @@ - .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..0a33b0cc 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -1,144 +1,145 @@ - .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..d9229a08 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -1,148 +1,153 @@ - .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_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..d011987d 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -1,154 +1,159 @@ - .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_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..91f8480b 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -1,160 +1,161 @@ - .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 { - 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 d2526206..d88e68e4 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -1,164 +1,165 @@ - .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: #202020; + background: #202020 } .ace-monokai .ace_gutter_active_line { - background-color: #272727; + background-color: #272727 } .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_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..3383af29 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -1,154 +1,159 @@ - .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..0dd836e6 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -1,147 +1,147 @@ - .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_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..567f64b8 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -1,146 +1,146 @@ - .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_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/tomorrow.css b/lib/ace/theme/tomorrow.css index e5bb2e88..fa30fe5f 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -1,180 +1,181 @@ - .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_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_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..5ccaf476 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -1,180 +1,181 @@ - .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_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_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..45d7ccb1 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -1,180 +1,181 @@ - .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_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_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..af08f92d 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -1,180 +1,181 @@ - .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_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_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..64223ab0 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -1,176 +1,177 @@ - .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_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_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..b19eb085 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -1,166 +1,167 @@ - .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..fcfb7889 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -1,145 +1,146 @@ - .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); }); From 021d169fbe4aee6b669d7c15847f02d4b8986757 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 18 Sep 2012 23:28:33 +0400 Subject: [PATCH 3/6] remove redundant rules from themes --- lib/ace/css/editor.css | 12 ++ lib/ace/theme/chrome.css | 3 - lib/ace/theme/clouds.css | 15 +- lib/ace/theme/clouds_midnight.css | 15 +- lib/ace/theme/cobalt.css | 10 +- lib/ace/theme/dawn.css | 15 +- lib/ace/theme/dreamweaver.css | 3 - lib/ace/theme/idle_fingers.css | 17 +- lib/ace/theme/kr_theme.css | 10 +- lib/ace/theme/merbivore.css | 46 ++--- lib/ace/theme/merbivore_soft.css | 53 ++---- lib/ace/theme/mono_industrial.css | 44 +---- lib/ace/theme/monokai.css | 50 +---- lib/ace/theme/pastel_on_dark.css | 24 +-- lib/ace/theme/solarized_dark.css | 51 ++--- lib/ace/theme/solarized_light.css | 41 +---- lib/ace/theme/textmate.css | 3 - lib/ace/theme/tomorrow.css | 77 ++------ lib/ace/theme/tomorrow_night.css | 77 ++------ lib/ace/theme/tomorrow_night_blue.css | 82 ++------- lib/ace/theme/tomorrow_night_bright.css | 77 ++------ lib/ace/theme/tomorrow_night_eighties.css | 75 ++------ lib/ace/theme/twilight.css | 37 +--- lib/ace/theme/vibrant_ink.css | 30 +-- tool/Theme.tmpl.css | 215 ---------------------- tool/tmlanguage.js | 8 +- tool/tmtheme.js | 139 +++++++++----- 27 files changed, 306 insertions(+), 923 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 9891976a..015cff6c 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -343,3 +343,15 @@ transition: opacity 0.05s ease 0.05s; opacity:1; } + +.ace_underline { + text-decoration: underline; +} + +.ace_bold { + font-weight: bold; +} + +.ace_italic { + font-style: italic; +} diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index 7c0ed3bd..2b8d60f9 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -104,9 +104,6 @@ color: #0000A2; } -.ace-chrome .ace_markup.ace_underline { - text-decoration:underline; -} .ace-chrome .ace_markup.ace_heading { color: rgb(12, 7, 255); diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index 16fac9c6..2fdc0815 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -93,18 +93,11 @@ border-color: #000000 } -.ace-clouds .ace_support.ace_function { - color: #C52727 -} - -.ace-clouds .ace_support.ace_function, +.ace-clouds .ace_storage, .ace-clouds .ace_support.ace_class, -.ace-clouds .ace_support.ace_type, -.ace-clouds .ace_support.ace_other { - color: #C52727 -} - -.ace-clouds .ace_storage { +.ace-clouds .ace_support.ace_function, +.ace-clouds .ace_support.ace_other, +.ace-clouds .ace_support.ace_type { color: #C52727 } diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index 6a5009aa..2d4ea2d1 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -94,18 +94,11 @@ border-color: #929292 } -.ace-clouds-midnight .ace_support.ace_function { - color: #E92E2E -} - -.ace-clouds-midnight .ace_support.ace_function, +.ace-clouds-midnight .ace_storage, .ace-clouds-midnight .ace_support.ace_class, -.ace-clouds-midnight .ace_support.ace_type, -.ace-clouds-midnight .ace_support.ace_other { - color: #E92E2E -} - -.ace-clouds-midnight .ace_storage { +.ace-clouds-midnight .ace_support.ace_function, +.ace-clouds-midnight .ace_support.ace_other, +.ace-clouds-midnight .ace_support.ace_type { color: #E92E2E } diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index d23d3aef..0ebfa6fc 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -73,18 +73,12 @@ } .ace-cobalt .ace_constant, +.ace-cobalt .ace_constant.ace_character, +.ace-cobalt .ace_constant.ace_character.ace_escape, .ace-cobalt .ace_constant.ace_other { color: #FF628C } -.ace-cobalt .ace_constant.ace_character { - color: #FF628C -} - -.ace-cobalt .ace_constant.ace_character.ace_escape { - color: #FF628C -} - .ace-cobalt .ace_invalid { color: #F8F8F8; background-color: #800F00 diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index 0d14dbf3..6c84998b 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -73,18 +73,12 @@ } .ace-dawn .ace_constant, +.ace-dawn .ace_constant.ace_character, +.ace-dawn .ace_constant.ace_character.ace_escape, .ace-dawn .ace_constant.ace_other { color: #811F24 } -.ace-dawn .ace_constant.ace_character { - color: #811F24 -} - -.ace-dawn .ace_constant.ace_character.ace_escape { - color: #811F24 -} - .ace-dawn .ace_invalid.ace_illegal { text-decoration: underline; font-style: italic; @@ -111,6 +105,7 @@ border-color: #080808 } +.ace-dawn .ace_markup.ace_list, .ace-dawn .ace_support.ace_function { color: #693A17 } @@ -145,10 +140,6 @@ color: #19356D } -.ace-dawn .ace_markup.ace_list { - color: #693A17 -} - .ace-dawn .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4+fPnf4ZVq1b9BwAkVQboFQv98gAAAABJRU5ErkJggg==) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css index ab845390..de6056fc 100644 --- a/lib/ace/theme/dreamweaver.css +++ b/lib/ace/theme/dreamweaver.css @@ -115,9 +115,6 @@ color: #00F; } -.ace-dreamweaver .ace_markup.ace_underline { - text-decoration:underline; -} .ace-dreamweaver .ace_markup.ace_heading { color: rgb(12, 7, 255); diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index ce7f926b..b83a700b 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -73,15 +73,10 @@ } .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.ace_escape { +.ace-idle-fingers .ace_constant.ace_character, +.ace-idle-fingers .ace_constant.ace_character.ace_escape, +.ace-idle-fingers .ace_constant.ace_other, +.ace-idle-fingers .ace_support.ace_constant { color: #6C99BB } @@ -90,10 +85,6 @@ background-color: #FF0000 } -.ace-idle-fingers .ace_support.ace_constant { - color: #6C99BB -} - .ace-idle-fingers .ace_fold { background-color: #CC7833; border-color: #FFFFFF diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index 0a33b0cc..c4883af1 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -73,18 +73,12 @@ } .ace-kr-theme .ace_constant, +.ace-kr-theme .ace_constant.ace_character, +.ace-kr-theme .ace_constant.ace_character.ace_escape, .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.ace_escape { - color: rgba(210, 117, 24, 0.76) -} - .ace-kr-theme .ace_invalid { color: #F8F8F8; background-color: #A41300 diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index d9229a08..7a4f0522 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -68,12 +68,18 @@ } .ace-merbivore .ace_keyword, -.ace-merbivore .ace_meta { +.ace-merbivore .ace_meta, +.ace-merbivore .ace_meta.ace_tag, +.ace-merbivore .ace_storage, +.ace-merbivore .ace_support.ace_function { color: #FC6F09 } .ace-merbivore .ace_constant, -.ace-merbivore .ace_constant.ace_other { +.ace-merbivore .ace_constant.ace_character, +.ace-merbivore .ace_constant.ace_character.ace_escape, +.ace-merbivore .ace_constant.ace_other, +.ace-merbivore .ace_support.ace_type { color: #1EDAFB } @@ -81,19 +87,13 @@ color: #519F50 } -.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 } -.ace-merbivore .ace_constant.ace_library { +.ace-merbivore .ace_constant.ace_library, +.ace-merbivore .ace_string, +.ace-merbivore .ace_support.ace_constant { color: #8DFF0A } @@ -106,40 +106,16 @@ background-color: #990000 } -.ace-merbivore .ace_support.ace_constant { - color: #8DFF0A -} - .ace-merbivore .ace_fold { background-color: #FC6F09; border-color: #E6E1DC } -.ace-merbivore .ace_support.ace_function { - color: #FC6F09 -} - -.ace-merbivore .ace_support.ace_type { - color: #1EDAFB -} - -.ace-merbivore .ace_storage { - color: #FC6F09 -} - -.ace-merbivore .ace_string { - color: #8DFF0A -} - .ace-merbivore .ace_comment { font-style: italic; color: #AD2EA4 } -.ace-merbivore .ace_meta.ace_tag { - color: #FC6F09 -} - .ace-merbivore .ace_entity.ace_other.ace_attribute-name { color: #FFFF89 } diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index d011987d..4069e99a 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -68,12 +68,17 @@ } .ace-merbivore-soft .ace_keyword, -.ace-merbivore-soft .ace_meta { +.ace-merbivore-soft .ace_meta, +.ace-merbivore-soft .ace_meta.ace_tag, +.ace-merbivore-soft .ace_storage { color: #FC803A } .ace-merbivore-soft .ace_constant, -.ace-merbivore-soft .ace_constant.ace_other { +.ace-merbivore-soft .ace_constant.ace_character, +.ace-merbivore-soft .ace_constant.ace_character.ace_escape, +.ace-merbivore-soft .ace_constant.ace_other, +.ace-merbivore-soft .ace_support.ace_type { color: #68C1D8 } @@ -81,19 +86,13 @@ color: #B3E5B4 } -.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 } -.ace-merbivore-soft .ace_constant.ace_library { +.ace-merbivore-soft .ace_constant.ace_library, +.ace-merbivore-soft .ace_string, +.ace-merbivore-soft .ace_support.ace_constant { color: #8EC65F } @@ -101,51 +100,23 @@ color: #7FC578 } -.ace-merbivore-soft .ace_invalid { - color: #FFFFFF; - background-color: #FE3838 -} - +.ace-merbivore-soft .ace_invalid, .ace-merbivore-soft .ace_invalid.ace_deprecated { color: #FFFFFF; background-color: #FE3838 } -.ace-merbivore-soft .ace_support.ace_constant { - color: #8EC65F -} - .ace-merbivore-soft .ace_fold { background-color: #FC803A; border-color: #E6E1DC } -.ace-merbivore-soft .ace_support.ace_type { - color: #68C1D8 -} - -.ace-merbivore-soft .ace_storage { - color: #FC803A -} - -.ace-merbivore-soft .ace_string { - color: #8EC65F -} - -.ace-merbivore-soft .ace_comment { - font-style: italic; - color: #AC4BB8 -} - +.ace-merbivore-soft .ace_comment, .ace-merbivore-soft .ace_meta { font-style: italic; color: #AC4BB8 } -.ace-merbivore-soft .ace_meta.ace_tag { - color: #FC803A -} - .ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name { color: #EAF1A3 } diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 91f8480b..065382a9 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -72,25 +72,18 @@ color: #A39E64 } -.ace-mono-industrial .ace_keyword.ace_operator { - color: #A8B3AB -} - .ace-mono-industrial .ace_constant, +.ace-mono-industrial .ace_constant.ace_character, +.ace-mono-industrial .ace_constant.ace_character.ace_escape, +.ace-mono-industrial .ace_constant.ace_numeric, .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.ace_escape { - color: #E98800 -} - -.ace-mono-industrial .ace_constant.ace_numeric { - color: #E98800 +.ace-mono-industrial .ace_entity.ace_name.ace_function, +.ace-mono-industrial .ace_keyword.ace_operator, +.ace-mono-industrial .ace_variable { + color: #A8B3AB } .ace-mono-industrial .ace_invalid { @@ -111,22 +104,17 @@ color: #588E60 } +.ace-mono-industrial .ace_entity.ace_name, +.ace-mono-industrial .ace_support.ace_class, .ace-mono-industrial .ace_support.ace_type { color: #5778B6 } -.ace-mono-industrial .ace_support.ace_class { - color: #5778B6 -} - .ace-mono-industrial .ace_storage { color: #C23B00 } -.ace-mono-industrial .ace_variable { - color: #A8B3AB -} - +.ace-mono-industrial .ace_variable.ace_language, .ace-mono-industrial .ace_variable.ace_parameter { color: #648BD2 } @@ -136,22 +124,10 @@ background-color: #151C19 } -.ace-mono-industrial .ace_variable.ace_language { - color: #648BD2 -} - .ace-mono-industrial .ace_entity.ace_other.ace_attribute-name { color: #909993 } -.ace-mono-industrial .ace_entity.ace_name { - color: #5778B6 -} - -.ace-mono-industrial .ace_entity.ace_name.ace_function { - color: #A8B3AB -} - .ace-mono-industrial .ace_markup.ace_underline { text-decoration: underline } diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index d88e68e4..a0b21851 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -68,22 +68,14 @@ } .ace-monokai .ace_keyword, -.ace-monokai .ace_meta { +.ace-monokai .ace_meta, +.ace-monokai .ace_storage { color: #F92672 } -.ace-monokai .ace_constant.ace_character { - color: #AE81FF -} - -.ace-monokai .ace_constant.ace_language { - color: #AE81FF -} - -.ace-monokai .ace_constant.ace_numeric { - color: #AE81FF -} - +.ace-monokai .ace_constant.ace_character, +.ace-monokai .ace_constant.ace_language, +.ace-monokai .ace_constant.ace_numeric, .ace-monokai .ace_constant.ace_other { color: #AE81FF } @@ -98,7 +90,8 @@ background-color: #AE81FF } -.ace-monokai .ace_support.ace_constant { +.ace-monokai .ace_support.ace_constant, +.ace-monokai .ace_support.ace_function { color: #66D9EF } @@ -107,30 +100,15 @@ border-color: #F8F8F2 } -.ace-monokai .ace_support.ace_function { - color: #66D9EF -} - -.ace-monokai .ace_support.ace_type { - font-style: italic; - color: #66D9EF -} - -.ace-monokai .ace_support.ace_class { - font-style: italic; - color: #66D9EF -} - -.ace-monokai .ace_storage { - color: #F92672 -} - .ace-monokai .ace_storage.ace_type, +.ace-monokai .ace_support.ace_class, .ace-monokai .ace_support.ace_type { font-style: italic; color: #66D9EF } +.ace-monokai .ace_entity.ace_name.ace_function, +.ace-monokai .ace_entity.ace_other.ace_attribute-name, .ace-monokai .ace_variable { color: #A6E22E } @@ -148,14 +126,6 @@ color: #75715E } -.ace-monokai .ace_entity.ace_other.ace_attribute-name { - color: #A6E22E -} - -.ace-monokai .ace_entity.ace_name.ace_function { - color: #A6E22E -} - .ace-monokai .ace_markup.ace_underline { text-decoration: underline } diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index 3383af29..2d59a28e 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -72,27 +72,21 @@ color: #757aD8 } -.ace-pastel-on-dark .ace_keyword.ace_operator { - color: #797878 -} - .ace-pastel-on-dark .ace_constant, +.ace-pastel-on-dark .ace_constant.ace_character, +.ace-pastel-on-dark .ace_constant.ace_character.ace_escape, .ace-pastel-on-dark .ace_constant.ace_other { color: #4FB7C5 } +.ace-pastel-on-dark .ace_keyword.ace_operator { + color: #797878 +} + .ace-pastel-on-dark .ace_constant.ace_character { color: #AFA472 } -.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 } @@ -101,11 +95,7 @@ color: #CCCCCC } -.ace-pastel-on-dark .ace_invalid { - color: #F8F8F8; - background-color: rgba(86, 45, 86, 0.75) -} - +.ace-pastel-on-dark .ace_invalid, .ace-pastel-on-dark .ace_invalid.ace_illegal { color: #F8F8F8; background-color: rgba(86, 45, 86, 0.75) diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 0dd836e6..6de92823 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -20,6 +20,8 @@ background-color: #002B36 } +.ace-solarized-dark .ace_entity.ace_other.ace_attribute-name, +.ace-solarized-dark .ace_storage, .ace-solarized-dark .ace_text-layer { color: #93A1A1 } @@ -33,6 +35,7 @@ border-bottom: 1px solid #D30102 } +.ace-solarized-dark .ace_marker-layer .ace_active_line, .ace-solarized-dark .ace_marker-layer .ace_selection { background: #073642 } @@ -51,10 +54,6 @@ border: 1px solid rgba(147, 161, 161, 0.50) } -.ace-solarized-dark .ace_marker-layer .ace_active_line { - background: #073642 -} - .ace-solarized-dark .ace_gutter_active_line { background-color: #0d3440 } @@ -68,11 +67,14 @@ } .ace-solarized-dark .ace_keyword, -.ace-solarized-dark .ace_meta { +.ace-solarized-dark .ace_meta, +.ace-solarized-dark .ace_support.ace_class, +.ace-solarized-dark .ace_support.ace_type { color: #859900 } -.ace-solarized-dark .ace_constant.ace_character { +.ace-solarized-dark .ace_constant.ace_character, +.ace-solarized-dark .ace_constant.ace_other { color: #CB4B16 } @@ -84,32 +86,15 @@ color: #D33682 } -.ace-solarized-dark .ace_constant.ace_other { - color: #CB4B16 -} - .ace-solarized-dark .ace_fold { background-color: #268BD2; border-color: #93A1A1 } -.ace-solarized-dark .ace_support.ace_function { - color: #268BD2 -} - -.ace-solarized-dark .ace_support.ace_type { - color: #859900 -} - -.ace-solarized-dark .ace_support.ace_class { - color: #859900 -} - -.ace-solarized-dark .ace_storage { - color: #93A1A1 -} - -.ace-solarized-dark .ace_variable { +.ace-solarized-dark .ace_entity.ace_name.ace_function, +.ace-solarized-dark .ace_support.ace_function, +.ace-solarized-dark .ace_variable, +.ace-solarized-dark .ace_variable.ace_language { color: #268BD2 } @@ -126,18 +111,6 @@ color: #657B83 } -.ace-solarized-dark .ace_variable.ace_language { - color: #268BD2 -} - -.ace-solarized-dark .ace_entity.ace_other.ace_attribute-name { - color: #93A1A1 -} - -.ace-solarized-dark .ace_entity.ace_name.ace_function { - color: #268BD2 -} - .ace-solarized-dark .ace_markup.ace_underline { text-decoration: underline } diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index 567f64b8..4a3e0c25 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -68,11 +68,14 @@ } .ace-solarized-light .ace_keyword, -.ace-solarized-light .ace_meta { +.ace-solarized-light .ace_meta, +.ace-solarized-light .ace_support.ace_class, +.ace-solarized-light .ace_support.ace_type { color: #859900 } -.ace-solarized-light .ace_constant.ace_character { +.ace-solarized-light .ace_constant.ace_character, +.ace-solarized-light .ace_constant.ace_other { color: #CB4B16 } @@ -84,35 +87,22 @@ color: #D33682 } -.ace-solarized-light .ace_constant.ace_other { - color: #CB4B16 -} - .ace-solarized-light .ace_fold { background-color: #268BD2; border-color: #586E75 } -.ace-solarized-light .ace_support.ace_function { +.ace-solarized-light .ace_entity.ace_name.ace_function, +.ace-solarized-light .ace_support.ace_function, +.ace-solarized-light .ace_variable, +.ace-solarized-light .ace_variable.ace_language { color: #268BD2 } -.ace-solarized-light .ace_support.ace_type { - color: #859900 -} - -.ace-solarized-light .ace_support.ace_class { - color: #859900 -} - .ace-solarized-light .ace_storage { color: #073642 } -.ace-solarized-light .ace_variable { - color: #268BD2 -} - .ace-solarized-light .ace_string { color: #2AA198 } @@ -121,22 +111,11 @@ color: #D30102 } -.ace-solarized-light .ace_comment { - color: #93A1A1 -} - -.ace-solarized-light .ace_variable.ace_language { - color: #268BD2 -} - +.ace-solarized-light .ace_comment, .ace-solarized-light .ace_entity.ace_other.ace_attribute-name { color: #93A1A1 } -.ace-solarized-light .ace_entity.ace_name.ace_function { - color: #268BD2 -} - .ace-solarized-light .ace_markup.ace_underline { text-decoration: underline } diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index 80b9ae1d..c328b3aa 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -112,9 +112,6 @@ color: #0000A2; } -.ace-tm .ace_markup.ace_underline { - text-decoration:underline; -} .ace-tm .ace_markup.ace_heading { color: rgb(12, 7, 255); diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index fa30fe5f..f59686b1 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -68,7 +68,10 @@ } .ace-tomorrow .ace_keyword, -.ace-tomorrow .ace_meta { +.ace-tomorrow .ace_meta, +.ace-tomorrow .ace_storage, +.ace-tomorrow .ace_storage.ace_type, +.ace-tomorrow .ace_support.ace_type { color: #8959A8 } @@ -76,15 +79,11 @@ color: #3E999F } -.ace-tomorrow .ace_constant.ace_character { - color: #F5871F -} - -.ace-tomorrow .ace_constant.ace_language { - color: #F5871F -} - -.ace-tomorrow .ace_constant.ace_numeric { +.ace-tomorrow .ace_constant.ace_character, +.ace-tomorrow .ace_constant.ace_language, +.ace-tomorrow .ace_constant.ace_numeric, +.ace-tomorrow .ace_support.ace_constant, +.ace-tomorrow .ace_variable.ace_parameter { color: #F5871F } @@ -102,49 +101,31 @@ background-color: #8959A8 } -.ace-tomorrow .ace_support.ace_constant { - color: #F5871F -} - .ace-tomorrow .ace_fold { background-color: #4271AE; border-color: #4D4D4C } -.ace-tomorrow .ace_support.ace_function { - color: #4271AE -} - -.ace-tomorrow .ace_support.ace_type { - color: #C99E00 -} - -.ace-tomorrow .ace_support.ace_class { - color: #C99E00 -} - -.ace-tomorrow .ace_storage { - color: #8959A8 -} - -.ace-tomorrow .ace_storage.ace_type, -.ace-tomorrow .ace_support.ace_type { - color: #8959A8 -} - +.ace-tomorrow .ace_entity.ace_name.ace_function, +.ace-tomorrow .ace_support.ace_function, .ace-tomorrow .ace_variable { color: #4271AE } -.ace-tomorrow .ace_variable.ace_parameter { - color: #F5871F +.ace-tomorrow .ace_support.ace_class, +.ace-tomorrow .ace_support.ace_type { + color: #C99E00 } +.ace-tomorrow .ace_markup.ace_heading, .ace-tomorrow .ace_string { color: #718C00 } -.ace-tomorrow .ace_string.ace_regexp { +.ace-tomorrow .ace_entity.ace_other.ace_attribute-name, +.ace-tomorrow .ace_meta.ace_tag, +.ace-tomorrow .ace_string.ace_regexp, +.ace-tomorrow .ace_variable { color: #C82829 } @@ -152,30 +133,10 @@ color: #8E908C } -.ace-tomorrow .ace_variable { - color: #C82829 -} - -.ace-tomorrow .ace_meta.ace_tag { - color: #C82829 -} - -.ace-tomorrow .ace_entity.ace_other.ace_attribute-name { - color: #C82829 -} - -.ace-tomorrow .ace_entity.ace_name.ace_function { - color: #4271AE -} - .ace-tomorrow .ace_markup.ace_underline { text-decoration: underline } -.ace-tomorrow .ace_markup.ace_heading { - color: #718C00 -} - .ace-tomorrow .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index 5ccaf476..3f7c8661 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -68,7 +68,10 @@ } .ace-tomorrow-night .ace_keyword, -.ace-tomorrow-night .ace_meta { +.ace-tomorrow-night .ace_meta, +.ace-tomorrow-night .ace_storage, +.ace-tomorrow-night .ace_storage.ace_type, +.ace-tomorrow-night .ace_support.ace_type { color: #B294BB } @@ -76,15 +79,11 @@ color: #8ABEB7 } -.ace-tomorrow-night .ace_constant.ace_character { - color: #DE935F -} - -.ace-tomorrow-night .ace_constant.ace_language { - color: #DE935F -} - -.ace-tomorrow-night .ace_constant.ace_numeric { +.ace-tomorrow-night .ace_constant.ace_character, +.ace-tomorrow-night .ace_constant.ace_language, +.ace-tomorrow-night .ace_constant.ace_numeric, +.ace-tomorrow-night .ace_support.ace_constant, +.ace-tomorrow-night .ace_variable.ace_parameter { color: #DE935F } @@ -102,49 +101,31 @@ background-color: #B798BF } -.ace-tomorrow-night .ace_support.ace_constant { - color: #DE935F -} - .ace-tomorrow-night .ace_fold { background-color: #81A2BE; border-color: #C5C8C6 } -.ace-tomorrow-night .ace_support.ace_function { - color: #81A2BE -} - -.ace-tomorrow-night .ace_support.ace_type { - color: #F0C674 -} - -.ace-tomorrow-night .ace_support.ace_class { - color: #F0C674 -} - -.ace-tomorrow-night .ace_storage { - color: #B294BB -} - -.ace-tomorrow-night .ace_storage.ace_type, -.ace-tomorrow-night .ace_support.ace_type { - color: #B294BB -} - +.ace-tomorrow-night .ace_entity.ace_name.ace_function, +.ace-tomorrow-night .ace_support.ace_function, .ace-tomorrow-night .ace_variable { color: #81A2BE } -.ace-tomorrow-night .ace_variable.ace_parameter { - color: #DE935F +.ace-tomorrow-night .ace_support.ace_class, +.ace-tomorrow-night .ace_support.ace_type { + color: #F0C674 } +.ace-tomorrow-night .ace_markup.ace_heading, .ace-tomorrow-night .ace_string { color: #B5BD68 } -.ace-tomorrow-night .ace_string.ace_regexp { +.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name, +.ace-tomorrow-night .ace_meta.ace_tag, +.ace-tomorrow-night .ace_string.ace_regexp, +.ace-tomorrow-night .ace_variable { color: #CC6666 } @@ -152,30 +133,10 @@ color: #969896 } -.ace-tomorrow-night .ace_variable { - color: #CC6666 -} - -.ace-tomorrow-night .ace_meta.ace_tag { - color: #CC6666 -} - -.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name { - color: #CC6666 -} - -.ace-tomorrow-night .ace_entity.ace_name.ace_function { - color: #81A2BE -} - .ace-tomorrow-night .ace_markup.ace_underline { text-decoration: underline } -.ace-tomorrow-night .ace_markup.ace_heading { - color: #B5BD68 -} - .ace-tomorrow-night .ace_indent-guide { 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_blue.css b/lib/ace/theme/tomorrow_night_blue.css index 45d7ccb1..07849e33 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -20,6 +20,7 @@ background-color: #002451 } +.ace-tomorrow-night-blue .ace_constant.ace_other, .ace-tomorrow-night-blue .ace_text-layer { color: #FFFFFF } @@ -68,7 +69,10 @@ } .ace-tomorrow-night-blue .ace_keyword, -.ace-tomorrow-night-blue .ace_meta { +.ace-tomorrow-night-blue .ace_meta, +.ace-tomorrow-night-blue .ace_storage, +.ace-tomorrow-night-blue .ace_storage.ace_type, +.ace-tomorrow-night-blue .ace_support.ace_type { color: #EBBBFF } @@ -76,22 +80,14 @@ color: #99FFFF } -.ace-tomorrow-night-blue .ace_constant.ace_character { +.ace-tomorrow-night-blue .ace_constant.ace_character, +.ace-tomorrow-night-blue .ace_constant.ace_language, +.ace-tomorrow-night-blue .ace_constant.ace_numeric, +.ace-tomorrow-night-blue .ace_support.ace_constant, +.ace-tomorrow-night-blue .ace_variable.ace_parameter { color: #FFC58F } -.ace-tomorrow-night-blue .ace_constant.ace_language { - color: #FFC58F -} - -.ace-tomorrow-night-blue .ace_constant.ace_numeric { - color: #FFC58F -} - -.ace-tomorrow-night-blue .ace_constant.ace_other { - color: #FFFFFF -} - .ace-tomorrow-night-blue .ace_invalid { color: #FFFFFF; background-color: #F99DA5 @@ -102,49 +98,31 @@ background-color: #EBBBFF } -.ace-tomorrow-night-blue .ace_support.ace_constant { - color: #FFC58F -} - .ace-tomorrow-night-blue .ace_fold { background-color: #BBDAFF; border-color: #FFFFFF } -.ace-tomorrow-night-blue .ace_support.ace_function { - color: #BBDAFF -} - -.ace-tomorrow-night-blue .ace_support.ace_type { - color: #FFEEAD -} - -.ace-tomorrow-night-blue .ace_support.ace_class { - color: #FFEEAD -} - -.ace-tomorrow-night-blue .ace_storage { - 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_entity.ace_name.ace_function, +.ace-tomorrow-night-blue .ace_support.ace_function, .ace-tomorrow-night-blue .ace_variable { color: #BBDAFF } -.ace-tomorrow-night-blue .ace_variable.ace_parameter { - color: #FFC58F +.ace-tomorrow-night-blue .ace_support.ace_class, +.ace-tomorrow-night-blue .ace_support.ace_type { + color: #FFEEAD } +.ace-tomorrow-night-blue .ace_markup.ace_heading, .ace-tomorrow-night-blue .ace_string { color: #D1F1A9 } -.ace-tomorrow-night-blue .ace_string.ace_regexp { +.ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name, +.ace-tomorrow-night-blue .ace_meta.ace_tag, +.ace-tomorrow-night-blue .ace_string.ace_regexp, +.ace-tomorrow-night-blue .ace_variable { color: #FF9DA4 } @@ -152,30 +130,10 @@ color: #7285B7 } -.ace-tomorrow-night-blue .ace_variable { - color: #FF9DA4 -} - -.ace-tomorrow-night-blue .ace_meta.ace_tag { - color: #FF9DA4 -} - -.ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name { - color: #FF9DA4 -} - -.ace-tomorrow-night-blue .ace_entity.ace_name.ace_function { - color: #BBDAFF -} - .ace-tomorrow-night-blue .ace_markup.ace_underline { text-decoration: underline } -.ace-tomorrow-night-blue .ace_markup.ace_heading { - color: #D1F1A9 -} - .ace-tomorrow-night-blue .ace_indent-guide { 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_bright.css b/lib/ace/theme/tomorrow_night_bright.css index af08f92d..4f74c2b9 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -68,7 +68,10 @@ } .ace-tomorrow-night-bright .ace_keyword, -.ace-tomorrow-night-bright .ace_meta { +.ace-tomorrow-night-bright .ace_meta, +.ace-tomorrow-night-bright .ace_storage, +.ace-tomorrow-night-bright .ace_storage.ace_type, +.ace-tomorrow-night-bright .ace_support.ace_type { color: #C397D8 } @@ -76,15 +79,11 @@ color: #70C0B1 } -.ace-tomorrow-night-bright .ace_constant.ace_character { - color: #E78C45 -} - -.ace-tomorrow-night-bright .ace_constant.ace_language { - color: #E78C45 -} - -.ace-tomorrow-night-bright .ace_constant.ace_numeric { +.ace-tomorrow-night-bright .ace_constant.ace_character, +.ace-tomorrow-night-bright .ace_constant.ace_language, +.ace-tomorrow-night-bright .ace_constant.ace_numeric, +.ace-tomorrow-night-bright .ace_support.ace_constant, +.ace-tomorrow-night-bright .ace_variable.ace_parameter { color: #E78C45 } @@ -102,49 +101,31 @@ background-color: #B798BF } -.ace-tomorrow-night-bright .ace_support.ace_constant { - color: #E78C45 -} - .ace-tomorrow-night-bright .ace_fold { background-color: #7AA6DA; border-color: #DEDEDE } -.ace-tomorrow-night-bright .ace_support.ace_function { - color: #7AA6DA -} - -.ace-tomorrow-night-bright .ace_support.ace_type { - color: #E7C547 -} - -.ace-tomorrow-night-bright .ace_support.ace_class { - color: #E7C547 -} - -.ace-tomorrow-night-bright .ace_storage { - 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_entity.ace_name.ace_function, +.ace-tomorrow-night-bright .ace_support.ace_function, .ace-tomorrow-night-bright .ace_variable { color: #7AA6DA } -.ace-tomorrow-night-bright .ace_variable.ace_parameter { - color: #E78C45 +.ace-tomorrow-night-bright .ace_support.ace_class, +.ace-tomorrow-night-bright .ace_support.ace_type { + color: #E7C547 } +.ace-tomorrow-night-bright .ace_markup.ace_heading, .ace-tomorrow-night-bright .ace_string { color: #B9CA4A } -.ace-tomorrow-night-bright .ace_string.ace_regexp { +.ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name, +.ace-tomorrow-night-bright .ace_meta.ace_tag, +.ace-tomorrow-night-bright .ace_string.ace_regexp, +.ace-tomorrow-night-bright .ace_variable { color: #D54E53 } @@ -152,30 +133,10 @@ color: #969896 } -.ace-tomorrow-night-bright .ace_variable { - color: #D54E53 -} - -.ace-tomorrow-night-bright .ace_meta.ace_tag { - color: #D54E53 -} - -.ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name { - color: #D54E53 -} - -.ace-tomorrow-night-bright .ace_entity.ace_name.ace_function { - color: #7AA6DA -} - .ace-tomorrow-night-bright .ace_markup.ace_underline { text-decoration: underline } -.ace-tomorrow-night-bright .ace_markup.ace_heading { - color: #B9CA4A -} - .ace-tomorrow-night-bright .ace_indent-guide { 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_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 64223ab0..469f3186 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -20,6 +20,7 @@ background-color: #2D2D2D } +.ace-tomorrow-night-eighties .ace_constant.ace_other, .ace-tomorrow-night-eighties .ace_text-layer { color: #CCCCCC } @@ -68,7 +69,10 @@ } .ace-tomorrow-night-eighties .ace_keyword, -.ace-tomorrow-night-eighties .ace_meta { +.ace-tomorrow-night-eighties .ace_meta, +.ace-tomorrow-night-eighties .ace_storage, +.ace-tomorrow-night-eighties .ace_storage.ace_type, +.ace-tomorrow-night-eighties .ace_support.ace_type { color: #CC99CC } @@ -76,22 +80,14 @@ color: #66CCCC } -.ace-tomorrow-night-eighties .ace_constant.ace_character { +.ace-tomorrow-night-eighties .ace_constant.ace_character, +.ace-tomorrow-night-eighties .ace_constant.ace_language, +.ace-tomorrow-night-eighties .ace_constant.ace_numeric, +.ace-tomorrow-night-eighties .ace_support.ace_constant, +.ace-tomorrow-night-eighties .ace_variable.ace_parameter { color: #F99157 } -.ace-tomorrow-night-eighties .ace_constant.ace_language { - color: #F99157 -} - -.ace-tomorrow-night-eighties .ace_constant.ace_numeric { - color: #F99157 -} - -.ace-tomorrow-night-eighties .ace_constant.ace_other { - color: #CCCCCC -} - .ace-tomorrow-night-eighties .ace_invalid { color: #CDCDCD; background-color: #F2777A @@ -102,44 +98,23 @@ background-color: #CC99CC } -.ace-tomorrow-night-eighties .ace_support.ace_constant { - color: #F99157 -} - .ace-tomorrow-night-eighties .ace_fold { background-color: #6699CC; border-color: #CCCCCC } -.ace-tomorrow-night-eighties .ace_support.ace_function { - color: #6699CC -} - -.ace-tomorrow-night-eighties .ace_support.ace_type { - color: #FFCC66 -} - -.ace-tomorrow-night-eighties .ace_support.ace_class { - color: #FFCC66 -} - -.ace-tomorrow-night-eighties .ace_storage { - 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_entity.ace_name.ace_function, +.ace-tomorrow-night-eighties .ace_support.ace_function, .ace-tomorrow-night-eighties .ace_variable { color: #6699CC } -.ace-tomorrow-night-eighties .ace_variable.ace_parameter { - color: #F99157 +.ace-tomorrow-night-eighties .ace_support.ace_class, +.ace-tomorrow-night-eighties .ace_support.ace_type { + color: #FFCC66 } +.ace-tomorrow-night-eighties .ace_markup.ace_heading, .ace-tomorrow-night-eighties .ace_string { color: #99CC99 } @@ -148,30 +123,16 @@ color: #999999 } +.ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name, +.ace-tomorrow-night-eighties .ace_meta.ace_tag, .ace-tomorrow-night-eighties .ace_variable { color: #F2777A } -.ace-tomorrow-night-eighties .ace_meta.ace_tag { - color: #F2777A -} - -.ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name { - color: #F2777A -} - -.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function { - color: #6699CC -} - .ace-tomorrow-night-eighties .ace_markup.ace_underline { text-decoration: underline } -.ace-tomorrow-night-eighties .ace_markup.ace_heading { - color: #99CC99 -} - .ace-tomorrow-night-eighties .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ1dX9z7Bq1ar/ABE1BITwhhuFAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index b19eb085..0d943563 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -73,15 +73,11 @@ } .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.ace_escape { +.ace-twilight .ace_constant.ace_character, +.ace-twilight .ace_constant.ace_character.ace_escape, +.ace-twilight .ace_constant.ace_other, +.ace-twilight .ace_markup.ace_heading, +.ace-twilight .ace_support.ace_constant { color: #CF6A4C } @@ -100,10 +96,6 @@ color: #9B859D } -.ace-twilight .ace_support.ace_constant { - color: #CF6A4C -} - .ace-twilight .ace_fold { background-color: #AC885B; border-color: #F8F8F8 @@ -113,10 +105,13 @@ color: #DAD085 } +.ace-twilight .ace_markup.ace_list, .ace-twilight .ace_storage { color: #F9EE98 } +.ace-twilight .ace_entity.ace_name.ace_function, +.ace-twilight .ace_meta.ace_tag, .ace-twilight .ace_variable { color: #AC885B } @@ -142,26 +137,10 @@ color: #494949 } -.ace-twilight .ace_meta.ace_tag { - color: #AC885B -} - -.ace-twilight .ace_entity.ace_name.ace_function { - color: #AC885B -} - .ace-twilight .ace_markup.ace_underline { text-decoration: underline } -.ace-twilight .ace_markup.ace_heading { - color: #CF6A4C -} - -.ace-twilight .ace_markup.ace_list { - color: #F9EE98 -} - .ace-twilight .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERH5zzBz5sz/AA5EBAYqeZXWAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css index fcfb7889..10481153 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -73,27 +73,17 @@ } .ace-vibrant-ink .ace_constant, +.ace-vibrant-ink .ace_constant.ace_character, +.ace-vibrant-ink .ace_constant.ace_character.ace_escape, .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.ace_escape { - color: #339999 -} - .ace-vibrant-ink .ace_constant.ace_numeric { color: #99CC99 } -.ace-vibrant-ink .ace_invalid { - color: #CCFF33; - background-color: #000000 -} - +.ace-vibrant-ink .ace_invalid, .ace-vibrant-ink .ace_invalid.ace_deprecated { color: #CCFF33; background-color: #000000 @@ -104,10 +94,8 @@ border-color: #FFFFFF } -.ace-vibrant-ink .ace_support.ace_function { - color: #FFCC00 -} - +.ace-vibrant-ink .ace_entity.ace_name.ace_function, +.ace-vibrant-ink .ace_support.ace_function, .ace-vibrant-ink .ace_variable { color: #FFCC00 } @@ -133,14 +121,6 @@ color: #99CC99 } -.ace-vibrant-ink .ace_entity.ace_name.ace_function { - color: #FFCC00 -} - -.ace-vibrant-ink .ace_markup.ace_underline { - text-decoration: underline -} - .ace-vibrant-ink .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPg5+f/z7Bq1ar/AA5lBCqoLxsgAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 6bb17908..0610485f 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -65,227 +65,12 @@ %selected_word_highlight% } -.%cssClass% .ace_invisible { - %invisible% -} - -.%cssClass% .ace_keyword, .%cssClass% .ace_meta { - %keyword% -} - -.%cssClass% .ace_keyword.ace_operator { - %keyword.operator% -} - -.%cssClass% .ace_keyword.ace_other.ace_unit { - %keyword.other.unit% -} - -.%cssClass% .ace_constant, .%cssClass% .ace_constant.ace_other { - %constant% -} - -.%cssClass% .ace_constant.ace_character { - %constant.character% -} - -.%cssClass% .ace_constant.ace_character.ace_escape { - %constant.character.escape% -} - -.%cssClass% .ace_constant.ace_character.ace_entity { - %constant.character.entity% -} - -.%cssClass% .ace_constant.ace_language { - %constant.language% -} - -.%cssClass% .ace_constant.ace_library { - %constant.library% -} - -.%cssClass% .ace_constant.ace_numeric { - %constant.numeric% -} - -.%cssClass% .ace_constant.ace_other { - %constant.other% -} - -.%cssClass% .ace_constant.ace_other.ace_color { - %constant.other.color% -} - -.%cssClass% .ace_invalid { - %invalid% -} - -.%cssClass% .ace_invalid.ace_illegal { - %invalid.illegal% -} - -.%cssClass% .ace_invalid.ace_deprecated { - %invalid.deprecated% -} - -.%cssClass% .ace_support { - %support% -} - -.%cssClass% .ace_support.ace_constant { - %support.constant% -} - -.%cssClass% support.constant.property-value { - %support.constant.property-value% -} - .%cssClass% .ace_fold { background-color: %fold%; border-color: %foreground%; } -.%cssClass% .ace_support.ace_function { - %support.function% -} -.%cssClass% .ace_support.ace_type { - %support.type% -} -.%cssClass% .ace_support.ace_class { - %support.class% -} -.%cssClass% .ace_support.ace_other { - %support.other% -} -.%cssClass% .ace_storage { - %storage% -} - -.%cssClass% .ace_storage.ace_type, .%cssClass% .ace_support.ace_type{ - %storage.type% -} - -.%cssClass% .ace_variable { - %entity.name.function% -} - -.%cssClass% .ace_variable.ace_parameter { - %variable.parameter% -} - -.%cssClass% .ace_function.ace_buildin { - %function.buildin% -} - -.%cssClass% .ace_string { - %string% -} - -.%cssClass% .ace_string.ace_regexp { - %string.regexp% -} - -.%cssClass% .ace_comment { - %comment% -} - -.%cssClass% .ace_comment.ace_doc { - %comment.doc% -} - -.%cssClass% .ace_comment.ace_doc.ace_tag { - %comment.doc.tag% -} - -.%cssClass% .ace_variable { - %variable% -} - -.%cssClass% .ace_variable.ace_language { - %variable.language% -} - -.%cssClass% .ace_xml_pe { - %xml_pe% -} - -.%cssClass% .ace_meta { - %meta% -} - -.%cssClass% .ace_meta.ace_tag { - %meta.tag% -} - -.%cssClass% .ace_meta.ace_tag.ace_input { - %ace.meta.tag.input% -} - -.%cssClass% .ace_meta.ace_selector { - %meta.selector% -} - -.%cssClass% .ace_entity.ace_other.ace_attribute-name { - %entity.other.attribute-name% -} - -.%cssClass% .ace_entity.ace_name { - %entity.name% -} - -.%cssClass% .ace_entity.ace_name.ace_function { - %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; -} - -.%cssClass% .ace_markup.ace_heading { - %markup.heading% -} - -.%cssClass% .ace_markup.ace_heading.ace_1 { - %markup.heading.1% -} - -.%cssClass% .ace_markup.ace_heading.ace_2 { - %markup.heading.2% -} - -.%cssClass% .ace_markup.ace_heading.ace_3 { - %markup.heading.3% -} - -.%cssClass% .ace_markup.ace_heading.ace_4 { - %markup.heading.4% -} - -.%cssClass% .ace_markup.ace_heading.ace_5 { - %markup.heading.5% -} - -.%cssClass% .ace_markup.ace_heading.ace_6 { - %markup.heading.6% -} - -.%cssClass% .ace_markup.ace_list { - %markup.list% -} - -.%cssClass% .ace_collab.ace_user1 { - %collab.user1% -} \ No newline at end of file diff --git a/tool/tmlanguage.js b/tool/tmlanguage.js index 6a6fcb03..155d87c8 100644 --- a/tool/tmlanguage.js +++ b/tool/tmlanguage.js @@ -84,8 +84,12 @@ function checkForLookBehind(str) { function removeXFlag(str) { if (str.slice(0,4) == "(?x)") { - str = str.substr(4).replace(/\\[\s#]|\s+|(?:#[^\n]*)/g, function(s) { - return s[0] == "\\" ? s[1] : ""; + str = str.replace(/\\.|\[([^\]\\]|\\.)*?\]|\s+|(?:#[^\n]*)/g, function(s) { + if (s[0] == "[") + return s; + if (s[0] == "\\") + return /[#\s]/.test(s[1]) ? s[1] : s; + return ""; }); } return str; diff --git a/tool/tmtheme.js b/tool/tmtheme.js index 81104f0e..3faeb12a 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -77,6 +77,12 @@ var supportedScopes = { "collab.user1": "collab.user1" }; +var fallbackScopes = { + "keyword": "meta", + "support.type": "storage.type", + "variable": "entity.name.function" +}; + function extractStyles(theme) { var globalSettings = theme.settings[0].settings; @@ -96,33 +102,34 @@ function extractStyles(theme) { }; for (var i=1; i 0) { - if (unsupportedScopes[scope] === undefined) { - unsupportedScopes[scope] = 1; - } - else { - unsupportedScopes[scope] = unsupportedScopes[scope] + 1; - } - } - } + var element = theme.settings[i]; + if (!element.scope) + continue; + var scopes = element.scope.split(/\s*[|,]\s*/g); + for (var j = 0; j < scopes.length; j++) { + var scope = scopes[j]; + var style = parseStyles(element.settings); + + var aceScope = supportedScopes[scope]; + if (aceScope) { + colors[aceScope] = style; + } + else if (style) { + unsupportedScopes[scope] = (unsupportedScopes[scope] || 0) + 1; + } + } + } + + for (var i in fallbackScopes) { + if (!colors[i]) + colors[i] = colors[fallbackScopes[i]]; } if (!colors.fold) { - var foldSource = colors["entity.name.function"] || colors.keyword; - if (foldSource) { - colors.fold = foldSource.match(/\:([^;]+)/)[1]; - } + var foldSource = colors["entity.name.function"] || colors.keyword; + if (foldSource) { + colors.fold = foldSource.match(/\:([^;]+)/)[1]; + } } if (!colors.selected_word_highlight) @@ -195,6 +202,28 @@ function quoteString(str) { var cssTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.css", "utf8"); var jsTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.js", "utf8"); +function normalizeStylesheet(rules) { + for (var i = rules.length; i--; ) { + var s = JSON.stringify(rules[i].declarations); + for (var j = i; j --; ) { + if (s == JSON.stringify(rules[j].declarations)) { + console.log(rules[j].selectors, rules[i].selectors) + console.log(i, j) + rules[j].selectors = rules[i].selectors.concat(rules[j].selectors); + rules.splice(i, 1); + break; + } + } + } + for (var i = rules.length; i--; ) { + var s = rules[i].selectors.sort(); + rules[i].selectors = s.filter(function(x, i) { + return x && x != s[i + 1]; + }); + } + return rules; +} + var themes = { //"chrome": "Chrome DevTools", "clouds": "Clouds", @@ -222,7 +251,7 @@ var themes = { "tomorrow_night_eighties": "Tomorrow-Night-Eighties", "twilight": "Twilight", "vibrant_ink": "Vibrant Ink", - "xcode": "Xcode_default" + //"xcode": "Xcode_default" }; function convertTheme(name) { @@ -235,6 +264,13 @@ function convertTheme(name) { styles.uuid = theme.uuid; var css = fillTemplate(cssTemplate, styles); css = css.replace(/[^\{\}]+{\s*}/g, ""); + + for (var i in supportedScopes) { + if (!styles[i]) + continue; + css += "." + styles.cssClass + " " + + i.replace(/^|\./g, ".ace_") + "{" + styles[i] + "}"; + } var js = fillTemplate(jsTemplate, { name: name, @@ -248,31 +284,34 @@ function convertTheme(name) { // 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); + var outThemeCss = fs.readFileSync(__dirname + "/../lib/ace/theme/" + name + ".css"); + var oldRules = cssParse(outThemeCss).stylesheet.rules; + var newRules = cssParse(css).stylesheet.rules; - for (var r = 0; r < parsedPotentialFile.stylesheet.rules.length; r++) { - var potentialSelectors = parsedPotentialFile.stylesheet.rules[r].selectors; - var found = false; + for (var i = 0; i < newRules.length; i++) { + var newSelectors = newRules[i].selectors; - 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; - } + for (var j = 0; j < oldRules.length; j++) { + var oldSelectors = oldRules[j].selectors; + newSelectors = newSelectors.filter(function(s) { + return oldSelectors.indexOf(s) == -1; + }) + if (!newSelectors.length) + break; + } + if (newSelectors.length) { + newRules[i].selectors = newSelectors; + console.log("Adding NEW rule: ", newRules[i]) + oldRules.splice(i, 0, newRules[i]); + } } - 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 }); + + oldRules = normalizeStylesheet(oldRules); + + css = cssStringify({stylesheet: {rules: oldRules}}, { compress: false }); } catch(e) { - console.log("Creating new file: " + name + ".css") + console.log("Creating new file: " + name + ".css") } fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".js", js); @@ -286,11 +325,11 @@ for (var name in themes) { var sortedUnsupportedScopes = {}; for (var u in unsupportedScopes) { - var value = unsupportedScopes[u]; - if (sortedUnsupportedScopes[value] === undefined) { - sortedUnsupportedScopes[value] = []; - } - sortedUnsupportedScopes[value].push(u); + var value = unsupportedScopes[u]; + if (sortedUnsupportedScopes[value] === undefined) { + sortedUnsupportedScopes[value] = []; + } + sortedUnsupportedScopes[value].push(u); } console.log("I found these unsupported scopes:"); From ecfdc5fbc4691b7d3933416b65da340768111f04 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Wed, 12 Sep 2012 00:11:35 -0700 Subject: [PATCH 4/6] Update themes some more --- kitchen-sink.html | 1 + lib/ace/theme/clouds.css | 12 +- lib/ace/theme/clouds_midnight.css | 12 +- lib/ace/theme/merbivore.css | 1 + lib/ace/theme/merbivore_soft.css | 1 + lib/ace/theme/mono_industrial.css | 6 +- lib/ace/theme/monokai.css | 1 + lib/ace/theme/solarized_dark.css | 1 + lib/ace/theme/solarized_light.css | 1 + lib/ace/theme/tomorrow.css | 2 + lib/ace/theme/tomorrow_night.css | 2 + lib/ace/theme/tomorrow_night_blue.css | 2 + lib/ace/theme/tomorrow_night_bright.css | 2 + lib/ace/theme/tomorrow_night_eighties.css | 2 + lib/ace/theme/xcode.css | 120 ++++ lib/ace/theme/xcode.js | 39 ++ tool/tmtheme.js | 6 +- tool/tmthemes/Chrome DevTools.tmTheme | 294 +++++++++ tool/tmthemes/Dreamweaver.tmTheme | 521 ++++++++++++++++ tool/tmthemes/GitHub.tmTheme | 573 ++++++++++++++++++ ...tmTheme => Textmate (Mac Classic).tmTheme} | 0 tool/tmthemes/Xcode_default.tmTheme | 240 ++++++++ 22 files changed, 1835 insertions(+), 4 deletions(-) create mode 100644 lib/ace/theme/xcode.css create mode 100644 lib/ace/theme/xcode.js create mode 100644 tool/tmthemes/Chrome DevTools.tmTheme create mode 100644 tool/tmthemes/Dreamweaver.tmTheme create mode 100644 tool/tmthemes/GitHub.tmTheme rename tool/tmthemes/{Mac Classic.tmTheme => Textmate (Mac Classic).tmTheme} (100%) create mode 100644 tool/tmthemes/Xcode_default.tmTheme diff --git a/kitchen-sink.html b/kitchen-sink.html index 43a128ea..176257d8 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -70,6 +70,7 @@ + diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index 2fdc0815..e0e35f22 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -68,7 +68,8 @@ } .ace-clouds .ace_keyword, -.ace-clouds .ace_meta { +.ace-clouds .ace_meta, +.ace-clouds .ace_support.ace_constant.ace_property-value { color: #AF956F } @@ -76,6 +77,10 @@ color: #484848 } +.ace-clouds .ace_keyword.ace_other.ace_unit { + color: #96DC5F +} + .ace-clouds .ace_constant.ace_language { color: #39946A } @@ -84,6 +89,10 @@ color: #46A609 } +.ace-clouds .ace_constant.ace_character.ace_entity { + color: #BF78CC +} + .ace-clouds .ace_invalid { background-color: #FF002A } @@ -109,6 +118,7 @@ color: #BCC8BA } +.ace-clouds .ace_entity.ace_name.ace_tag, .ace-clouds .ace_entity.ace_other.ace_attribute-name { color: #606060 } diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index 2d4ea2d1..70c5dd34 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -68,7 +68,8 @@ } .ace-clouds-midnight .ace_keyword, -.ace-clouds-midnight .ace_meta { +.ace-clouds-midnight .ace_meta, +.ace-clouds-midnight .ace_support.ace_constant.ace_property-value { color: #927C5D } @@ -76,6 +77,10 @@ color: #4B4B4B } +.ace-clouds-midnight .ace_keyword.ace_other.ace_unit { + color: #366F1A +} + .ace-clouds-midnight .ace_constant.ace_language { color: #39946A } @@ -84,6 +89,10 @@ color: #46A609 } +.ace-clouds-midnight .ace_constant.ace_character.ace_entity { + color: #A165AC +} + .ace-clouds-midnight .ace_invalid { color: #FFFFFF; background-color: #E92E2E @@ -110,6 +119,7 @@ color: #3C403B } +.ace-clouds-midnight .ace_entity.ace_name.ace_tag, .ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name { color: #606060 } diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index 7a4f0522..75105771 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -67,6 +67,7 @@ color: #404040 } +.ace-merbivore .ace_entity.ace_name.ace_tag, .ace-merbivore .ace_keyword, .ace-merbivore .ace_meta, .ace-merbivore .ace_meta.ace_tag, diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index 4069e99a..aa5d02b7 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -67,6 +67,7 @@ color: #404040 } +.ace-merbivore-soft .ace_entity.ace_name.ace_tag, .ace-merbivore-soft .ace_keyword, .ace-merbivore-soft .ace_meta, .ace-merbivore-soft .ace_meta.ace_tag, diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 065382a9..3af8d934 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -132,6 +132,10 @@ text-decoration: underline } +.ace-mono-industrial .ace_entity.ace_name.ace_tag { + color: #A65EFF +} + .ace-mono-industrial .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y -} \ No newline at end of file +} diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index a0b21851..77afbd61 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -67,6 +67,7 @@ color: #49483E } +.ace-monokai .ace_entity.ace_name.ace_tag, .ace-monokai .ace_keyword, .ace-monokai .ace_meta, .ace-monokai .ace_storage { diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 6de92823..a5b48472 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -92,6 +92,7 @@ } .ace-solarized-dark .ace_entity.ace_name.ace_function, +.ace-solarized-dark .ace_entity.ace_name.ace_tag, .ace-solarized-dark .ace_support.ace_function, .ace-solarized-dark .ace_variable, .ace-solarized-dark .ace_variable.ace_language { diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index 4a3e0c25..e56c0430 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -93,6 +93,7 @@ } .ace-solarized-light .ace_entity.ace_name.ace_function, +.ace-solarized-light .ace_entity.ace_name.ace_tag, .ace-solarized-light .ace_support.ace_function, .ace-solarized-light .ace_variable, .ace-solarized-light .ace_variable.ace_language { diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index f59686b1..c4511eeb 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -82,6 +82,7 @@ .ace-tomorrow .ace_constant.ace_character, .ace-tomorrow .ace_constant.ace_language, .ace-tomorrow .ace_constant.ace_numeric, +.ace-tomorrow .ace_keyword.ace_other.ace_unit, .ace-tomorrow .ace_support.ace_constant, .ace-tomorrow .ace_variable.ace_parameter { color: #F5871F @@ -122,6 +123,7 @@ color: #718C00 } +.ace-tomorrow .ace_entity.ace_name.ace_tag, .ace-tomorrow .ace_entity.ace_other.ace_attribute-name, .ace-tomorrow .ace_meta.ace_tag, .ace-tomorrow .ace_string.ace_regexp, diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index 3f7c8661..ec96fdcc 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -82,6 +82,7 @@ .ace-tomorrow-night .ace_constant.ace_character, .ace-tomorrow-night .ace_constant.ace_language, .ace-tomorrow-night .ace_constant.ace_numeric, +.ace-tomorrow-night .ace_keyword.ace_other.ace_unit, .ace-tomorrow-night .ace_support.ace_constant, .ace-tomorrow-night .ace_variable.ace_parameter { color: #DE935F @@ -122,6 +123,7 @@ color: #B5BD68 } +.ace-tomorrow-night .ace_entity.ace_name.ace_tag, .ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name, .ace-tomorrow-night .ace_meta.ace_tag, .ace-tomorrow-night .ace_string.ace_regexp, diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index 07849e33..bd77e5af 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -83,6 +83,7 @@ .ace-tomorrow-night-blue .ace_constant.ace_character, .ace-tomorrow-night-blue .ace_constant.ace_language, .ace-tomorrow-night-blue .ace_constant.ace_numeric, +.ace-tomorrow-night-blue .ace_keyword.ace_other.ace_unit, .ace-tomorrow-night-blue .ace_support.ace_constant, .ace-tomorrow-night-blue .ace_variable.ace_parameter { color: #FFC58F @@ -119,6 +120,7 @@ color: #D1F1A9 } +.ace-tomorrow-night-blue .ace_entity.ace_name.ace_tag, .ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name, .ace-tomorrow-night-blue .ace_meta.ace_tag, .ace-tomorrow-night-blue .ace_string.ace_regexp, diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 4f74c2b9..18860611 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -82,6 +82,7 @@ .ace-tomorrow-night-bright .ace_constant.ace_character, .ace-tomorrow-night-bright .ace_constant.ace_language, .ace-tomorrow-night-bright .ace_constant.ace_numeric, +.ace-tomorrow-night-bright .ace_keyword.ace_other.ace_unit, .ace-tomorrow-night-bright .ace_support.ace_constant, .ace-tomorrow-night-bright .ace_variable.ace_parameter { color: #E78C45 @@ -122,6 +123,7 @@ color: #B9CA4A } +.ace-tomorrow-night-bright .ace_entity.ace_name.ace_tag, .ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name, .ace-tomorrow-night-bright .ace_meta.ace_tag, .ace-tomorrow-night-bright .ace_string.ace_regexp, diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 469f3186..dfc38b64 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -83,6 +83,7 @@ .ace-tomorrow-night-eighties .ace_constant.ace_character, .ace-tomorrow-night-eighties .ace_constant.ace_language, .ace-tomorrow-night-eighties .ace_constant.ace_numeric, +.ace-tomorrow-night-eighties .ace_keyword.ace_other.ace_unit, .ace-tomorrow-night-eighties .ace_support.ace_constant, .ace-tomorrow-night-eighties .ace_variable.ace_parameter { color: #F99157 @@ -123,6 +124,7 @@ color: #999999 } +.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_tag, .ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name, .ace-tomorrow-night-eighties .ace_meta.ace_tag, .ace-tomorrow-night-eighties .ace_variable { diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css new file mode 100644 index 00000000..c457d2f7 --- /dev/null +++ b/lib/ace/theme/xcode.css @@ -0,0 +1,120 @@ +.ace-xcode .ace_editor, +/* 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_constant.ace_language, +.ace-xcode .ace_keyword, +.ace-xcode .ace_meta, +.ace-xcode .ace_variable.ace_language { + color: #C800A4 +} + +.ace-xcode .ace_invisible { + color: #BFBFBF +} + +.ace-xcode .ace_constant.ace_character, +.ace-xcode .ace_constant.ace_other { + color: #275A5E +} + +.ace-xcode .ace_constant.ace_numeric { + color: #3A00DC +} + +.ace-xcode .ace_entity.ace_other.ace_attribute-name, +.ace-xcode .ace_support.ace_constant, +.ace-xcode .ace_support.ace_function { + color: #450084 +} + +.ace-xcode .ace_fold { + background-color: #C800A4; + border-color: #000000 +} + +.ace-xcode .ace_entity.ace_name.ace_tag, +.ace-xcode .ace_support.ace_class, +.ace-xcode .ace_support.ace_type { + color: #790EAD +} + +.ace-xcode .ace_storage { + color: #C900A4 +} + +.ace-xcode .ace_string { + color: #DF0002 +} + +.ace-xcode .ace_comment { + color: #008E00 +} + +.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/tmtheme.js b/tool/tmtheme.js index 3faeb12a..c78626cb 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -16,6 +16,7 @@ var unsupportedScopes = { }; var supportedScopes = { "keyword": "keyword", "keyword.operator": "keyword.operator", + "keyword.other.unit": "keyword.other.unit", "constant": "constant", "constant.language": "constant.language", @@ -23,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", @@ -31,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", @@ -59,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", 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/Mac Classic.tmTheme b/tool/tmthemes/Textmate (Mac Classic).tmTheme similarity index 100% rename from tool/tmthemes/Mac Classic.tmTheme rename to tool/tmthemes/Textmate (Mac Classic).tmTheme 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 + + From a6ce721d92867ac5791814076f9da79f642de287 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 19 Sep 2012 16:20:57 +0400 Subject: [PATCH 5/6] add indent guides for ambiance and xcode --- lib/ace/theme/ambiance.css | 4 ++++ lib/ace/theme/xcode.css | 6 ++---- tool/tmtheme.js | 31 ++++++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/lib/ace/theme/ambiance.css b/lib/ace/theme/ambiance.css index fba5dcc3..6468d9b4 100644 --- a/lib/ace/theme/ambiance.css +++ b/lib/ace/theme/ambiance.css @@ -231,3 +231,7 @@ .ace-ambiance .ace_text-layer { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC"); } + +.ace-ambiance .ace_indent-guide { + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQUFD4z6Crq/sfAAuYAuYl+7lfAAAAAElFTkSuQmCC") right repeat-y; +} \ No newline at end of file diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css index c457d2f7..4ff0646a 100644 --- a/lib/ace/theme/xcode.css +++ b/lib/ace/theme/xcode.css @@ -1,6 +1,4 @@ -.ace-xcode .ace_editor, /* 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) } @@ -115,6 +113,6 @@ color: #008E00 } -.ace-xcode .ace_markup.ace_underline { - text-decoration: underline +.ace-xcode .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/tool/tmtheme.js b/tool/tmtheme.js index c78626cb..9480c0a2 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -339,4 +339,33 @@ for (var u in unsupportedScopes) { 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 +console.log("Refer to the docs on ace.ajax.org for information on how to add a scope to the CSS generator."); + + +/*** TODO: generate images for indent guides in node + +var indentGuideColor = "#2D2D2D" +var canvas = document.createElement("canvas") +canvas.width = 1; canvas.height = 2; +var ctx = canvas.getContext("2d") +imageData = ctx.getImageData(0,0,1,2) + +function getColor(color) { + ctx.fillStyle = color; + ctx.fillRect(0,0,1,2); + return Array.slice(ctx.getImageData(0,0,1,2).data).slice(0,4) +} +bgColor = getComputedStyle(ace.renderer.scroller).backgroundColor +var a = [].concat(getColor(bgColor), getColor(indentGuideColor)); +a.forEach(function(val,i){imageData.data[i] = val}) + +ctx.putImageData(imageData,0,0) +image = canvas.toDataURL("png") + +var rule = "."+ace.renderer.$theme +" .ace_indent-guide {\n\ + background: url(" + image +") right repeat-y;\n\ +}" +console.log(rule) +require("ace/lib/dom").importCssString(rule) + +*/ \ No newline at end of file From 3aca398f1d68acc41af768d839fd7d9ac6eb4625 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 19 Sep 2012 21:32:40 +0400 Subject: [PATCH 6/6] fix active line color for solarized_dark theme --- lib/ace/theme/solarized_dark.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index a5b48472..49c386ef 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -37,7 +37,7 @@ .ace-solarized-dark .ace_marker-layer .ace_active_line, .ace-solarized-dark .ace_marker-layer .ace_selection { - background: #073642 + background: rgba(255, 255, 255, 0.1) } .ace-solarized-dark.multiselect .ace_selection.start {