From bca423f82609e8eca40ab57a69dfec0cd398d5ac Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Fri, 12 Aug 2011 13:52:33 +0200 Subject: [PATCH] update themes with highlighting for tags --- lib/ace/theme/clouds.js | 21 +++++++++++++++++++++ lib/ace/theme/clouds_midnight.js | 21 +++++++++++++++++++++ lib/ace/theme/cobalt.js | 21 +++++++++++++++++++++ lib/ace/theme/crimson_editor.js | 4 ++++ lib/ace/theme/dawn.js | 21 +++++++++++++++++++++ lib/ace/theme/eclipse.js | 14 +++++++++++++- lib/ace/theme/idle_fingers.js | 17 +++++++++++++++++ lib/ace/theme/kr_theme.js | 21 +++++++++++++++++++++ lib/ace/theme/merbivore.js | 23 ++++++++++++++++++++++- lib/ace/theme/merbivore_soft.js | 23 ++++++++++++++++++++++- lib/ace/theme/mono_industrial.js | 21 +++++++++++++++++++++ lib/ace/theme/monokai.js | 21 +++++++++++++++++++++ lib/ace/theme/solarized_dark.js | 17 +++++++++++++++++ lib/ace/theme/solarized_light.js | 17 +++++++++++++++++ lib/ace/theme/textmate.js | 4 ++++ lib/ace/theme/twilight.js | 21 +++++++++++++++++++++ lib/ace/theme/vibrant_ink.js | 24 +++++++++++++++++++++++- tool/Theme.tmpl.css | 17 +++++++++++++++++ tool/tmtheme.js | 14 +++++++++++--- 19 files changed, 335 insertions(+), 7 deletions(-) diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 6046ebd4..039c1a3c 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -186,6 +186,27 @@ define(function(require, exports, module) { \ .ace-clouds .ace_xml_pe {\ \ +}\ +\ +.ace-clouds .ace_meta {\ + \ +}\ +\ +.ace-clouds .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-clouds .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-clouds .ace_entity.ace_other.ace_attribute-name {\ + color:#606060;\ +}\ +\ +\ +.ace-clouds .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js index 51fbbe41..027537fd 100644 --- a/lib/ace/theme/clouds_midnight.js +++ b/lib/ace/theme/clouds_midnight.js @@ -187,6 +187,27 @@ background-color:#E92E2E;\ \ .ace-clouds-midnight .ace_xml_pe {\ \ +}\ +\ +.ace-clouds-midnight .ace_meta {\ + \ +}\ +\ +.ace-clouds-midnight .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-clouds-midnight .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name {\ + color:#606060;\ +}\ +\ +\ +.ace-clouds-midnight .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index e2762c2e..0abc16bd 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -188,6 +188,27 @@ color:#0088FF;\ \ .ace-cobalt .ace_xml_pe {\ \ +}\ +\ +.ace-cobalt .ace_meta {\ + \ +}\ +\ +.ace-cobalt .ace_meta.ace_tag {\ + color:#9EFFFF;\ +}\ +\ +.ace-cobalt .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-cobalt .ace_entity.ace_other.ace_attribute-name {\ + \ +}\ +\ +\ +.ace-cobalt .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/crimson_editor.js b/lib/ace/theme/crimson_editor.js index e48349ce..54ea8d97 100644 --- a/lib/ace/theme/crimson_editor.js +++ b/lib/ace/theme/crimson_editor.js @@ -182,6 +182,10 @@ define(function(require, exports, module) { background: rgb(232, 242, 254);\ }\ \ +.ace-crimson-editor .ace_meta.ace_tag {\ + color:rgb(28, 2, 255);\ +}\ +\ .ace-crimson-editor .ace_marker-layer .ace_selected_word {\ background: rgb(250, 250, 255);\ border: 1px solid rgb(200, 200, 250);\ diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index afab897a..c70fac51 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -192,6 +192,27 @@ color:#5A525F;\ \ .ace-dawn .ace_xml_pe {\ \ +}\ +\ +.ace-dawn .ace_meta {\ + \ +}\ +\ +.ace-dawn .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-dawn .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-dawn .ace_entity.ace_other.ace_attribute-name {\ + \ +}\ +\ +\ +.ace-dawn .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/eclipse.js b/lib/ace/theme/eclipse.js index c97ae0d0..0f2017e9 100644 --- a/lib/ace/theme/eclipse.js +++ b/lib/ace/theme/eclipse.js @@ -107,7 +107,11 @@ define(function(require, exports, module) { }\ \ .ace-eclipse .ace_line .ace_tag {\ - color: rgb(63, 127, 127);\ + color: rgb(63, 127, 127);\ +}\ +\ +.ace-eclipse .ace_line .ace_type {\ + color: rgb(127, 0, 127);\ }\ \ .ace-eclipse .ace_line .ace_xml_pe {\ @@ -123,6 +127,14 @@ define(function(require, exports, module) { border: 1px solid rgb(192, 192, 192);\ }\ \ +.ace-eclipse .ace_line .ace_meta.ace_tag {\ + color:rgb(63, 127, 127);\ +}\ +\ +.ace-eclipse .ace_entity.ace_other.ace_attribute-name {\ + color:rgb(127, 0, 127);\ +}\ +\ .ace-eclipse .ace_marker-layer .ace_active_line {\ background: rgb(232, 242, 254);\ }"; diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index 6273139e..c68810b8 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -190,6 +190,23 @@ color:#BC9458;\ \ }\ \ +.ace-idle-fingers .ace_meta {\ + \ +}\ +\ +.ace-idle-fingers .ace_meta.ace_tag {\ + color:#FFE5BB;\ +}\ +\ +.ace-idle-fingers .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-idle-fingers .ace_entity.ace_other.ace_attribute-name {\ + \ +}\ +\ +\ .ace-idle-fingers .ace_collab.ace_user1 {\ color:#323232;\ background-color:#FFF980; \ diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 28a48f62..3f76e941 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -188,6 +188,27 @@ color:#706D5B;\ \ .ace-kr-theme .ace_xml_pe {\ \ +}\ +\ +.ace-kr-theme .ace_meta {\ + \ +}\ +\ +.ace-kr-theme .ace_meta.ace_tag {\ + color:#BABD9C;\ +}\ +\ +.ace-kr-theme .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-kr-theme .ace_entity.ace_other.ace_attribute-name {\ + \ +}\ +\ +\ +.ace-kr-theme .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js index 0843474c..65972b40 100644 --- a/lib/ace/theme/merbivore.js +++ b/lib/ace/theme/merbivore.js @@ -134,7 +134,7 @@ define(function(require, exports, module) { \ .ace-merbivore .ace_invalid {\ color:#FFFFFF;\ - background-color:#990000;\ +background-color:#990000;\ }\ \ .ace-merbivore .ace_invalid.ace_illegal {\ @@ -188,6 +188,27 @@ define(function(require, exports, module) { \ .ace-merbivore .ace_xml_pe {\ \ +}\ +\ +.ace-merbivore .ace_meta {\ + \ +}\ +\ +.ace-merbivore .ace_meta.ace_tag {\ + color:#FC6F09;\ +}\ +\ +.ace-merbivore .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-merbivore .ace_entity.ace_other.ace_attribute-name {\ + color:#FFFF89;\ +}\ +\ +\ +.ace-merbivore .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js index 672278bb..a51e600c 100644 --- a/lib/ace/theme/merbivore_soft.js +++ b/lib/ace/theme/merbivore_soft.js @@ -134,7 +134,7 @@ define(function(require, exports, module) { \ .ace-merbivore-soft .ace_invalid {\ color:#FFFFFF;\ - background-color:#FE3838;\ +background-color:#FE3838;\ }\ \ .ace-merbivore-soft .ace_invalid.ace_illegal {\ @@ -188,6 +188,27 @@ define(function(require, exports, module) { \ .ace-merbivore-soft .ace_xml_pe {\ \ +}\ +\ +.ace-merbivore-soft .ace_meta {\ + \ +}\ +\ +.ace-merbivore-soft .ace_meta.ace_tag {\ + color:#FC803A;\ +}\ +\ +.ace-merbivore-soft .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name {\ + color:#EAF1A3;\ +}\ +\ +\ +.ace-merbivore-soft .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 04e1843d..da368c32 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -188,6 +188,27 @@ background-color:#151C19;\ \ .ace-mono-industrial .ace_xml_pe {\ \ +}\ +\ +.ace-mono-industrial .ace_meta {\ + \ +}\ +\ +.ace-mono-industrial .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-mono-industrial .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-mono-industrial .ace_entity.ace_other.ace_attribute-name {\ + color:#909993;\ +}\ +\ +\ +.ace-mono-industrial .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index 17d1d395..38b645cc 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -188,6 +188,27 @@ background-color:#AE81FF;\ \ .ace-monokai .ace_xml_pe {\ \ +}\ +\ +.ace-monokai .ace_meta {\ + \ +}\ +\ +.ace-monokai .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-monokai .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-monokai .ace_entity.ace_other.ace_attribute-name {\ + color:#A6E22E;\ +}\ +\ +\ +.ace-monokai .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js index 2a0baefb..65991223 100644 --- a/lib/ace/theme/solarized_dark.js +++ b/lib/ace/theme/solarized_dark.js @@ -189,6 +189,23 @@ color:#657B83;\ \ }\ \ +.ace-solarized-dark .ace_meta {\ + \ +}\ +\ +.ace-solarized-dark .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-solarized-dark .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-solarized-dark .ace_entity.ace_other.ace_attribute-name {\ + color:#93A1A1;\ +}\ +\ +\ .ace-solarized-dark .ace_collab.ace_user1 {\ \ }"; diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js index e8839918..cae5d526 100644 --- a/lib/ace/theme/solarized_light.js +++ b/lib/ace/theme/solarized_light.js @@ -188,6 +188,23 @@ define(function(require, exports, module) { \ }\ \ +.ace-solarized-light .ace_meta {\ + \ +}\ +\ +.ace-solarized-light .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-solarized-light .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-solarized-light .ace_entity.ace_other.ace_attribute-name {\ + color:#93A1A1;\ +}\ +\ +\ .ace-solarized-light .ace_collab.ace_user1 {\ \ }"; diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 1f3e9579..842d7969 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -182,6 +182,10 @@ define(function(require, exports, module) { border: 1px solid rgb(200, 200, 250);\ }\ \ +.ace-tm .ace_meta.ace_tag {\ + color:rgb(28, 2, 255);\ +}\ +\ .ace-tm .ace_string.ace_regex {\ color: rgb(255, 0, 0)\ }"; diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 7c5b5629..06ca00c8 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -190,6 +190,27 @@ color:#5F5A60;\ \ .ace-twilight .ace_xml_pe {\ color:#494949;\ +}\ +\ +.ace-twilight .ace_meta {\ + \ +}\ +\ +.ace-twilight .ace_meta.ace_tag {\ + color:#AC885B;\ +}\ +\ +.ace-twilight .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-twilight .ace_entity.ace_other.ace_attribute-name {\ + \ +}\ +\ +\ +.ace-twilight .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js index a6bf7921..0e1296f4 100644 --- a/lib/ace/theme/vibrant_ink.js +++ b/lib/ace/theme/vibrant_ink.js @@ -163,7 +163,7 @@ define(function(require, exports, module) { }\ \ .ace-vibrant-ink .ace_string.ace_regexp {\ - \ + color:#44B4CC;\ }\ \ .ace-vibrant-ink .ace_comment {\ @@ -188,6 +188,28 @@ define(function(require, exports, module) { \ .ace-vibrant-ink .ace_xml_pe {\ \ +}\ +\ +.ace-vibrant-ink .ace_meta {\ + \ +}\ +\ +.ace-vibrant-ink .ace_meta.ace_tag {\ + \ +}\ +\ +.ace-vibrant-ink .ace_meta.ace_tag.ace_input {\ + \ +}\ +\ +.ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name {\ + font-style:italic;\ +color:#99CC99;\ +}\ +\ +\ +.ace-vibrant-ink .ace_collab.ace_user1 {\ + \ }"; // import CSS once diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 64270089..59665c09 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -147,6 +147,23 @@ %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_entity.ace_other.ace_attribute-name { + %entity.other.attribute-name% +} + + .%cssClass% .ace_collab.ace_user1 { %collab.user1% } \ No newline at end of file diff --git a/tool/tmtheme.js b/tool/tmtheme.js index b9331017..4b21e97c 100644 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -83,7 +83,11 @@ var supportedScopes = { "variable": "variable", "variable.language": "variable.language", + "meta": "meta", "meta.tag.sgml.doctype": "xml_pe", + "meta.tag": "meta.tag", + "meta.tag.form": "meta.tag.form", + "entity.other.attribute-name": "entity.other.attribute-name", "collab.user1": "collab.user1" }; @@ -171,7 +175,7 @@ function createTheme(name, styles, cssTemplate, jsTemplate) { }; function hyphenate(str) { - return str.replace(/([A-Z])/g, "-$1").replace("_", "-").toLowerCase(); + return str.replace(/([A-Z])/g, "-$1").replace(/_/g, "-").toLowerCase(); } var cssTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.css", "utf8"); @@ -182,13 +186,17 @@ var themes = { "idle_fingers": "idleFingers", "twilight": "Twilight", "monokai": "Monokai", + "merbivore": "Merbivore", + "merbivore_soft": "Merbivore Soft", + "pastel_on_dark": "Pastels on Dark", "cobalt": "Cobalt", "mono_industrial": "monoindustrial", "clouds": "Clouds", "clouds_midnight": "Clouds Midnight", "kr_theme": "krTheme", - "solarized_light": "Solarized-light", - "solarized_dark": "Solarized-dark" + "solarized_light": "Solarized-light", + "solarized_dark": "Solarized-dark", + "vibrant_ink": "Vibrant Ink" } for (var name in themes) {