From 021d169fbe4aee6b669d7c15847f02d4b8986757 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 18 Sep 2012 23:28:33 +0400 Subject: [PATCH] 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:");