From 15c5290aec6b277b08800b33ec83f2b5fc28739b Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 16:50:23 +1000 Subject: [PATCH] Replace _ by - in css-classes --- demo/kitchen-sink/docs/diff.diff | 2 +- lib/ace/css/editor.css | 12 ++++++------ lib/ace/edit_session.js | 2 +- lib/ace/editor.js | 2 +- lib/ace/mode/_test/tokens_diff.json | 2 +- lib/ace/mode/_test/tokens_xml.json | 2 +- lib/ace/mode/coldfusion_highlight_rules.js | 2 +- lib/ace/mode/html_highlight_rules.js | 4 ++-- lib/ace/mode/liquid_highlight_rules.js | 2 +- lib/ace/mode/xml_highlight_rules.js | 4 ++-- lib/ace/mode/xquery/XQueryParser.js | 4 ++-- lib/ace/mode/xquery_highlight_rules.js | 2 +- lib/ace/mouse/default_gutter_handler.js | 2 +- lib/ace/theme/ambiance.css | 8 ++++---- lib/ace/theme/chrome.css | 10 +++++----- lib/ace/theme/clouds.css | 8 ++++---- lib/ace/theme/clouds_midnight.css | 8 ++++---- lib/ace/theme/cobalt.css | 8 ++++---- lib/ace/theme/crimson_editor.css | 10 +++++----- lib/ace/theme/dawn.css | 8 ++++---- lib/ace/theme/dreamweaver.css | 8 ++++---- lib/ace/theme/eclipse.css | 8 ++++---- lib/ace/theme/github.css | 8 ++++---- lib/ace/theme/idle_fingers.css | 8 ++++---- lib/ace/theme/kr_theme.css | 8 ++++---- lib/ace/theme/merbivore.css | 8 ++++---- lib/ace/theme/merbivore_soft.css | 8 ++++---- lib/ace/theme/mono_industrial.css | 8 ++++---- lib/ace/theme/monokai.css | 8 ++++---- lib/ace/theme/pastel_on_dark.css | 10 +++++----- lib/ace/theme/solarized_dark.css | 8 ++++---- lib/ace/theme/solarized_light.css | 8 ++++---- lib/ace/theme/textmate.css | 10 +++++----- lib/ace/theme/tomorrow.css | 8 ++++---- lib/ace/theme/tomorrow_night.css | 8 ++++---- lib/ace/theme/tomorrow_night_blue.css | 8 ++++---- lib/ace/theme/tomorrow_night_bright.css | 8 ++++---- lib/ace/theme/tomorrow_night_eighties.css | 8 ++++---- lib/ace/theme/twilight.css | 10 +++++----- lib/ace/theme/vibrant_ink.css | 8 ++++---- lib/ace/theme/xcode.css | 8 ++++---- lib/ace/virtual_renderer.js | 6 +++--- tool/Theme.tmpl.css | 8 ++++---- tool/tmtheme.js | 2 +- 44 files changed, 146 insertions(+), 146 deletions(-) diff --git a/demo/kitchen-sink/docs/diff.diff b/demo/kitchen-sink/docs/diff.diff index 3f58128a..16c89890 100644 --- a/demo/kitchen-sink/docs/diff.diff +++ b/demo/kitchen-sink/docs/diff.diff @@ -16,7 +16,7 @@ index 23fc3fc..ed3b273 100644 + this.highlight = function(re) { + if (!this.$searchHighlight) { -+ var highlight = new SearchHighlight(null, "ace_selected_word", "text"); ++ var highlight = new SearchHighlight(null, "ace_selected-word", "text"); + this.$searchHighlight = this.addDynamicMarker(highlight); + } + this.$searchHighlight.setRegexp(re); diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 7e0c3a76..bd880d10 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -27,7 +27,7 @@ z-index: 4; } -.ace_gutter_active_line { +.ace_gutter-active-line { position: absolute; left: 0; right: 0; @@ -75,7 +75,7 @@ left: 0; } -.ace_editor .ace_print_margin_layer { +.ace_editor .ace_print-margin-layer { z-index: 0; position: absolute; overflow: hidden; @@ -85,7 +85,7 @@ width: 100%; } -.ace_editor .ace_print_margin { +.ace_editor .ace_print-margin { position: absolute; height: 100%; } @@ -182,12 +182,12 @@ z-index: 6; } -.ace_marker-layer .ace_active_line { +.ace_marker-layer .ace_active-line { position: absolute; z-index: 2; } -.ace_marker-layer .ace_selected_word { +.ace_marker-layer .ace_selected-word { position: absolute; z-index: 4; box-sizing: border-box; @@ -236,7 +236,7 @@ cursor: move; } -.ace_gutter_tooltip { +.ace_gutter-tooltip { background-color: #FFFFD5; border: 1px solid gray; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index 496c2d7e..fc916302 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -378,7 +378,7 @@ var EditSession = function(text, mode) { this.highlight = function(re) { if (!this.$searchHighlight) { - var highlight = new SearchHighlight(null, "ace_selected_word", "text"); + var highlight = new SearchHighlight(null, "ace_selected-word", "text"); this.$searchHighlight = this.addDynamicMarker(highlight); } this.$searchHighlight.setRegexp(re); diff --git a/lib/ace/editor.js b/lib/ace/editor.js index d2e1725f..1010a49d 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -497,7 +497,7 @@ var Editor = function(renderer, session) { } else { range = new Range(cursor.row, 0, cursor.row+1, 0); } - session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background"); + session.$highlightLineMarker = session.addMarker(range, "ace_active-line", "background"); } } }; diff --git a/lib/ace/mode/_test/tokens_diff.json b/lib/ace/mode/_test/tokens_diff.json index 6e7f99c3..fa28d05d 100644 --- a/lib/ace/mode/_test/tokens_diff.json +++ b/lib/ace/mode/_test/tokens_diff.json @@ -193,7 +193,7 @@ "state": "start", "data": [ [ "support.constant", "+" ], - [ "text", " var highlight = new SearchHighlight(null, \"ace_selected_word\", \"text\");" ] + [ "text", " var highlight = new SearchHighlight(null, \"ace_selected-word\", \"text\");" ] ] }, { diff --git a/lib/ace/mode/_test/tokens_xml.json b/lib/ace/mode/_test/tokens_xml.json index 06b50b48..b7c9dcfd 100644 --- a/lib/ace/mode/_test/tokens_xml.json +++ b/lib/ace/mode/_test/tokens_xml.json @@ -2,7 +2,7 @@ { "state": "start", "data": [ - [ "xml_pe", "" ] + [ "xml-pe", "" ] ] }, { diff --git a/lib/ace/mode/coldfusion_highlight_rules.js b/lib/ace/mode/coldfusion_highlight_rules.js index ed2a7448..3108081f 100644 --- a/lib/ace/mode/coldfusion_highlight_rules.js +++ b/lib/ace/mode/coldfusion_highlight_rules.js @@ -49,7 +49,7 @@ var ColdfusionHighlightRules = function() { regex : "<\\!\\[CDATA\\[", next : "cdata" }, { - token : "xml_pe", + token : "xml-pe", regex : "<\\?.*?\\?>" }, { token : "comment", diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js index 2c4e5b76..cf80bdd7 100644 --- a/lib/ace/mode/html_highlight_rules.js +++ b/lib/ace/mode/html_highlight_rules.js @@ -68,7 +68,7 @@ var HtmlHighlightRules = function() { regex : "<\\!\\[CDATA\\[", next : "cdata" }, { - token : "xml_pe", + token : "xml-pe", regex : "<\\?.*?\\?>" }, { token : "comment", @@ -76,7 +76,7 @@ var HtmlHighlightRules = function() { regex : "<\\!--", next : "comment" }, { - token : "xml_pe", + token : "xml-pe", regex : "<\\!.*?>" }, { token : "meta.tag", diff --git a/lib/ace/mode/liquid_highlight_rules.js b/lib/ace/mode/liquid_highlight_rules.js index 2666c4a2..5b4f9c0b 100644 --- a/lib/ace/mode/liquid_highlight_rules.js +++ b/lib/ace/mode/liquid_highlight_rules.js @@ -87,7 +87,7 @@ var LiquidHighlightRules = function() { regex : "<\\!\\[CDATA\\[", next : "cdata" }, { - token : "xml_pe", + token : "xml-pe", regex : "<\\?.*?\\?>" }, { token : "comment", diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js index 4a57864e..3244d572 100644 --- a/lib/ace/mode/xml_highlight_rules.js +++ b/lib/ace/mode/xml_highlight_rules.js @@ -45,7 +45,7 @@ var XmlHighlightRules = function() { regex : "<\\!\\[CDATA\\[", next : "cdata" }, { - token : "xml_pe", + token : "xml-pe", regex : "<\\?.*?\\?>" }, { token : "comment", @@ -53,7 +53,7 @@ var XmlHighlightRules = function() { regex : "<\\!--", next : "comment" }, { - token : "xml_pe", + token : "xml-pe", regex : "<\\!.*?>" }, { token : "meta.tag", // opening tag diff --git a/lib/ace/mode/xquery/XQueryParser.js b/lib/ace/mode/xquery/XQueryParser.js index 99d0544b..bebdb0e7 100644 --- a/lib/ace/mode/xquery/XQueryParser.js +++ b/lib/ace/mode/xquery/XQueryParser.js @@ -121,12 +121,12 @@ var XQueryParser = function(input, state) { this.ap = function(token) { - this.addToken(token, "xml_pe"); + this.addToken(token, "xml-pe"); }; this.ax = function(start, stop) { - this.highlighter.addToken(start.getStartIndex(), stop.getStopIndex(), "xml_pe"); + this.highlighter.addToken(start.getStartIndex(), stop.getStopIndex(), "xml-pe"); }; this.at = function(start, stop) diff --git a/lib/ace/mode/xquery_highlight_rules.js b/lib/ace/mode/xquery_highlight_rules.js index 4d4bd6ce..7149beb8 100644 --- a/lib/ace/mode/xquery_highlight_rules.js +++ b/lib/ace/mode/xquery_highlight_rules.js @@ -48,7 +48,7 @@ var XQueryHighlightRules = function() { regex : "<\\!\\[CDATA\\[", next : "cdata" }, { - token : "xml_pe", + token : "xml-pe", regex : "<\\?.*?\\?>" }, { token : "comment", diff --git a/lib/ace/mouse/default_gutter_handler.js b/lib/ace/mouse/default_gutter_handler.js index 281fe8d0..9e409b75 100644 --- a/lib/ace/mouse/default_gutter_handler.js +++ b/lib/ace/mouse/default_gutter_handler.js @@ -61,7 +61,7 @@ function GutterHandler(mouseHandler) { var tooltipTimeout, mouseEvent, tooltip, tooltipAnnotation; function createTooltip() { tooltip = dom.createElement("div"); - tooltip.className = "ace_gutter_tooltip"; + tooltip.className = "ace_gutter-tooltip"; tooltip.style.maxWidth = "500px"; tooltip.style.display = "none"; editor.container.appendChild(tooltip); diff --git a/lib/ace/theme/ambiance.css b/lib/ace/theme/ambiance.css index 6468d9b4..c7dfa72c 100644 --- a/lib/ace/theme/ambiance.css +++ b/lib/ace/theme/ambiance.css @@ -60,7 +60,7 @@ content: '‣' } -.ace-ambiance .ace_print_margin { +.ace-ambiance .ace_print-margin { border-left: 1px dotted #2D2D2D; width: 100%; background: #262626; @@ -97,7 +97,7 @@ background: rgba(221, 240, 255, 0.20); } -.ace-ambiance .ace_marker-layer .ace_selected_word { +.ace-ambiance .ace_marker-layer .ace_selected-word { border-radius: 4px; border: 8px solid #3f475d; box-shadow: 0 0 4px black; @@ -112,7 +112,7 @@ border: 1px solid rgba(255, 255, 255, 0.25); } -.ace-ambiance .ace_marker-layer .ace_active_line { +.ace-ambiance .ace_marker-layer .ace_active-line { background: rgba(255, 255, 255, 0.031); } @@ -223,7 +223,7 @@ color: #9b859d; } -.ace-ambiance .ace_xml_pe { +.ace-ambiance .ace_xml-pe { color: #494949; } diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index 2b8d60f9..40aab517 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -12,7 +12,7 @@ overflow : hidden; } -.ace-chrome .ace_print_margin { +.ace-chrome .ace_print-margin { width: 1px; background: #e8e8e8; } @@ -96,7 +96,7 @@ color: rgb(49, 132, 149); } -.ace-chrome .ace_line .ace_xml_pe { +.ace-chrome .ace_line .ace_xml-pe { color: rgb(104, 104, 91); } @@ -130,15 +130,15 @@ border: 1px solid rgb(192, 192, 192); } -.ace-chrome .ace_marker-layer .ace_active_line { +.ace-chrome .ace_marker-layer .ace_active-line { background: rgba(0, 0, 0, 0.07); } -.ace-chrome .ace_gutter_active_line { +.ace-chrome .ace_gutter-active-line { background-color : #dcdcdc; } -.ace-chrome .ace_marker-layer .ace_selected_word { +.ace-chrome .ace_marker-layer .ace_selected-word { background: rgb(250, 250, 255); border: 1px solid rgb(200, 200, 250); } diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index e0e35f22..4167e3ef 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -11,7 +11,7 @@ color: #333 } -.ace-clouds .ace_print_margin { +.ace-clouds .ace_print-margin { width: 1px; background: #e8e8e8 } @@ -51,15 +51,15 @@ border: 1px solid #BFBFBF } -.ace-clouds .ace_marker-layer .ace_active_line { +.ace-clouds .ace_marker-layer .ace_active-line { background: #FFFBD1 } -.ace-clouds .ace_gutter_active_line { +.ace-clouds .ace_gutter-active-line { background-color : #dcdcdc } -.ace-clouds .ace_marker-layer .ace_selected_word { +.ace-clouds .ace_marker-layer .ace_selected-word { border: 1px solid #BDD5FC } diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index 70c5dd34..c4415713 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -11,7 +11,7 @@ color: #929292 } -.ace-clouds-midnight .ace_print_margin { +.ace-clouds-midnight .ace_print-margin { width: 1px; background: #232323 } @@ -51,15 +51,15 @@ border: 1px solid #BFBFBF } -.ace-clouds-midnight .ace_marker-layer .ace_active_line { +.ace-clouds-midnight .ace_marker-layer .ace_active-line { background: rgba(215, 215, 215, 0.031) } -.ace-clouds-midnight .ace_gutter_active_line { +.ace-clouds-midnight .ace_gutter-active-line { background-color: rgba(215, 215, 215, 0.031) } -.ace-clouds-midnight .ace_marker-layer .ace_selected_word { +.ace-clouds-midnight .ace_marker-layer .ace_selected-word { border: 1px solid #000000 } diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index 0ebfa6fc..67c49845 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -11,7 +11,7 @@ color: #fff } -.ace-cobalt .ace_print_margin { +.ace-cobalt .ace_print-margin { width: 1px; background: #011e3a } @@ -51,15 +51,15 @@ border: 1px solid rgba(255, 255, 255, 0.15) } -.ace-cobalt .ace_marker-layer .ace_active_line { +.ace-cobalt .ace_marker-layer .ace_active-line { background: rgba(0, 0, 0, 0.35) } -.ace-cobalt .ace_gutter_active_line { +.ace-cobalt .ace_gutter-active-line { background-color: rgba(0, 0, 0, 0.35) } -.ace-cobalt .ace_marker-layer .ace_selected_word { +.ace-cobalt .ace_marker-layer .ace_selected-word { border: 1px solid rgba(179, 101, 57, 0.75) } diff --git a/lib/ace/theme/crimson_editor.css b/lib/ace/theme/crimson_editor.css index ab8300de..5c79cb0d 100644 --- a/lib/ace/theme/crimson_editor.css +++ b/lib/ace/theme/crimson_editor.css @@ -17,7 +17,7 @@ text-align: right; } -.ace-crimson-editor .ace_print_margin { +.ace-crimson-editor .ace_print-margin { width: 1px; background: #e8e8e8; } @@ -112,7 +112,7 @@ color: rgb(0, 64, 128); } -.ace-crimson-editor .ace_line .ace_xml_pe { +.ace-crimson-editor .ace_line .ace_xml-pe { color: rgb(104, 104, 91); } @@ -133,11 +133,11 @@ border: 1px solid rgb(192, 192, 192); } -.ace-crimson-editor .ace_marker-layer .ace_active_line { +.ace-crimson-editor .ace_marker-layer .ace_active-line { background: rgb(232, 242, 254); } -.ace-crimson-editor .ace_gutter_active_line { +.ace-crimson-editor .ace_gutter-active-line { background-color : #dcdcdc; } @@ -145,7 +145,7 @@ color:rgb(28, 2, 255); } -.ace-crimson-editor .ace_marker-layer .ace_selected_word { +.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.css b/lib/ace/theme/dawn.css index 6c84998b..e5692b45 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -11,7 +11,7 @@ color: #333 } -.ace-dawn .ace_print_margin { +.ace-dawn .ace_print-margin { width: 1px; background: #e8e8e8 } @@ -51,15 +51,15 @@ border: 1px solid rgba(75, 75, 126, 0.50) } -.ace-dawn .ace_marker-layer .ace_active_line { +.ace-dawn .ace_marker-layer .ace_active-line { background: rgba(36, 99, 180, 0.12) } -.ace-dawn .ace_gutter_active_line { +.ace-dawn .ace_gutter-active-line { background-color : #dcdcdc } -.ace-dawn .ace_marker-layer .ace_selected_word { +.ace-dawn .ace_marker-layer .ace_selected-word { border: 1px solid rgba(39, 95, 255, 0.30) } diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css index de6056fc..09f9d1a9 100644 --- a/lib/ace/theme/dreamweaver.css +++ b/lib/ace/theme/dreamweaver.css @@ -11,7 +11,7 @@ color: #333; } -.ace-dreamweaver .ace_print_margin { +.ace-dreamweaver .ace_print-margin { width: 1px; background: #e8e8e8; } @@ -107,7 +107,7 @@ color: #06F } -.ace-dreamweaver .ace_line .ace_xml_pe { +.ace-dreamweaver .ace_line .ace_xml-pe { color: rgb(104, 104, 91); } @@ -141,11 +141,11 @@ border: 1px solid rgb(192, 192, 192); } -.ace-dreamweaver .ace_marker-layer .ace_active_line { +.ace-dreamweaver .ace_marker-layer .ace_active-line { background: rgba(0, 0, 0, 0.07); } -.ace-dreamweaver .ace_marker-layer .ace_selected_word { +.ace-dreamweaver .ace_marker-layer .ace_selected-word { background: rgb(250, 250, 255); border: 1px solid rgb(200, 200, 250); } diff --git a/lib/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css index 27b9a001..cf222181 100644 --- a/lib/ace/theme/eclipse.css +++ b/lib/ace/theme/eclipse.css @@ -12,7 +12,7 @@ color: rgb(136, 136, 136); } -.ace-eclipse .ace_print_margin { +.ace-eclipse .ace_print-margin { width: 1px; background: #ebebeb; } @@ -77,7 +77,7 @@ color: rgb(127, 0, 127); } -.ace-eclipse .ace_line .ace_xml_pe { +.ace-eclipse .ace_line .ace_xml-pe { color: rgb(104, 104, 91); } @@ -101,11 +101,11 @@ background: rgb(255, 255, 0); } -.ace-eclipse .ace_marker-layer .ace_active_line { +.ace-eclipse .ace_marker-layer .ace_active-line { background: rgb(232, 242, 254); } -.ace-eclipse .ace_marker-layer .ace_selected_word { +.ace-eclipse .ace_marker-layer .ace_selected-word { border: 1px solid rgb(181, 213, 255); } diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css index 6233b427..e9755423 100644 --- a/lib/ace/theme/github.css +++ b/lib/ace/theme/github.css @@ -88,7 +88,7 @@ border-bottom: 1px solid black; } -.ace-github .ace_marker-layer .ace_active_line { +.ace-github .ace_marker-layer .ace_active-line { background: rgb(255, 255, 204); } .ace-github .ace_marker-layer .ace_selection { @@ -117,17 +117,17 @@ border: 1px solid rgb(192, 192, 192); } -.ace-github .ace_gutter_active_line { +.ace-github .ace_gutter-active-line { background-color : rgba(0, 0, 0, 0.07); } -.ace-github .ace_marker-layer .ace_selected_word { +.ace-github .ace_marker-layer .ace_selected-word { background: rgb(250, 250, 255); border: 1px solid rgb(200, 200, 250); } -.ace-github .ace_print_margin { +.ace-github .ace_print-margin { width: 1px; background: #e8e8e8; } diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index b83a700b..0cd4849f 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -11,7 +11,7 @@ color: #fff } -.ace-idle-fingers .ace_print_margin { +.ace-idle-fingers .ace_print-margin { width: 1px; background: #3b3b3b } @@ -51,15 +51,15 @@ border: 1px solid #404040 } -.ace-idle-fingers .ace_marker-layer .ace_active_line { +.ace-idle-fingers .ace_marker-layer .ace_active-line { background: #353637 } -.ace-idle-fingers .ace_gutter_active_line { +.ace-idle-fingers .ace_gutter-active-line { background-color: #353637 } -.ace-idle-fingers .ace_marker-layer .ace_selected_word { +.ace-idle-fingers .ace_marker-layer .ace_selected-word { border: 1px solid rgba(90, 100, 126, 0.88) } diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index c4883af1..b4d5a4b4 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -11,7 +11,7 @@ color: #FCFFE0 } -.ace-kr-theme .ace_print_margin { +.ace-kr-theme .ace_print-margin { width: 1px; background: #1c1917 } @@ -51,15 +51,15 @@ border: 1px solid rgba(255, 177, 111, 0.32) } -.ace-kr-theme .ace_marker-layer .ace_active_line { +.ace-kr-theme .ace_marker-layer .ace_active-line { background: #38403D } -.ace-kr-theme .ace_gutter_active_line { +.ace-kr-theme .ace_gutter-active-line { background-color : #38403D } -.ace-kr-theme .ace_marker-layer .ace_selected_word { +.ace-kr-theme .ace_marker-layer .ace_selected-word { border: 1px solid rgba(170, 0, 255, 0.45) } diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index 75105771..2c0504a9 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -11,7 +11,7 @@ color: #E6E1DC } -.ace-merbivore .ace_print_margin { +.ace-merbivore .ace_print-margin { width: 1px; background: #555651 } @@ -51,15 +51,15 @@ border: 1px solid #404040 } -.ace-merbivore .ace_marker-layer .ace_active_line { +.ace-merbivore .ace_marker-layer .ace_active-line { background: #333435 } -.ace-merbivore .ace_gutter_active_line { +.ace-merbivore .ace_gutter-active-line { background-color: #333435 } -.ace-merbivore .ace_marker-layer .ace_selected_word { +.ace-merbivore .ace_marker-layer .ace_selected-word { border: 1px solid #454545 } diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index aa5d02b7..c7e0cc1f 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -11,7 +11,7 @@ color: #E6E1DC } -.ace-merbivore-soft .ace_print_margin { +.ace-merbivore-soft .ace_print-margin { width: 1px; background: #262424 } @@ -51,15 +51,15 @@ border: 1px solid #404040 } -.ace-merbivore-soft .ace_marker-layer .ace_active_line { +.ace-merbivore-soft .ace_marker-layer .ace_active-line { background: #333435 } -.ace-merbivore-soft .ace_gutter_active_line { +.ace-merbivore-soft .ace_gutter-active-line { background-color: #333435 } -.ace-merbivore-soft .ace_marker-layer .ace_selected_word { +.ace-merbivore-soft .ace_marker-layer .ace_selected-word { border: 1px solid #494949 } diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 3af8d934..43a11ae7 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -11,7 +11,7 @@ color: #C5C9C9 } -.ace-mono-industrial .ace_print_margin { +.ace-mono-industrial .ace_print-margin { width: 1px; background: #555651 } @@ -51,15 +51,15 @@ border: 1px solid rgba(102, 108, 104, 0.50) } -.ace-mono-industrial .ace_marker-layer .ace_active_line { +.ace-mono-industrial .ace_marker-layer .ace_active-line { background: rgba(12, 13, 12, 0.25) } -.ace-mono-industrial .ace_gutter_active_line { +.ace-mono-industrial .ace_gutter-active-line { background-color: rgba(12, 13, 12, 0.25) } -.ace-mono-industrial .ace_marker-layer .ace_selected_word { +.ace-mono-industrial .ace_marker-layer .ace_selected-word { border: 1px solid rgba(145, 153, 148, 0.40) } diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 77afbd61..9ffd189b 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -11,7 +11,7 @@ color: #f1f1f1 } -.ace-monokai .ace_print_margin { +.ace-monokai .ace_print-margin { width: 1px; background: #555651 } @@ -51,15 +51,15 @@ border: 1px solid #49483E } -.ace-monokai .ace_marker-layer .ace_active_line { +.ace-monokai .ace_marker-layer .ace_active-line { background: #202020 } -.ace-monokai .ace_gutter_active_line { +.ace-monokai .ace_gutter-active-line { background-color: #272727 } -.ace-monokai .ace_marker-layer .ace_selected_word { +.ace-monokai .ace_marker-layer .ace_selected-word { border: 1px solid #49483E } diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index 2d59a28e..57e83356 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -11,7 +11,7 @@ color: #8F938F } -.ace-pastel-on-dark .ace_print_margin { +.ace-pastel-on-dark .ace_print-margin { width: 1px; background: #353030 } @@ -51,15 +51,15 @@ border: 1px solid rgba(255, 255, 255, 0.25) } -.ace-pastel-on-dark .ace_marker-layer .ace_active_line { +.ace-pastel-on-dark .ace_marker-layer .ace_active-line { background: rgba(255, 255, 255, 0.031) } -.ace-pastel-on-dark .ace_gutter_active_line { +.ace-pastel-on-dark .ace_gutter-active-line { background-color: rgba(255, 255, 255, 0.031) } -.ace-pastel-on-dark .ace_marker-layer .ace_selected_word { +.ace-pastel-on-dark .ace_marker-layer .ace_selected-word { border: 1px solid rgba(221, 240, 255, 0.20) } @@ -136,7 +136,7 @@ color: #C1C144 } -.ace-pastel-on-dark .ace_xml_pe { +.ace-pastel-on-dark .ace_xml-pe { color: #494949 } diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 49c386ef..8f802a9f 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -11,7 +11,7 @@ color: #d0edf7 } -.ace-solarized-dark .ace_print_margin { +.ace-solarized-dark .ace_print-margin { width: 1px; background: #33555E } @@ -35,7 +35,7 @@ border-bottom: 1px solid #D30102 } -.ace-solarized-dark .ace_marker-layer .ace_active_line, +.ace-solarized-dark .ace_marker-layer .ace_active-line, .ace-solarized-dark .ace_marker-layer .ace_selection { background: rgba(255, 255, 255, 0.1) } @@ -54,11 +54,11 @@ border: 1px solid rgba(147, 161, 161, 0.50) } -.ace-solarized-dark .ace_gutter_active_line { +.ace-solarized-dark .ace_gutter-active-line { background-color: #0d3440 } -.ace-solarized-dark .ace_marker-layer .ace_selected_word { +.ace-solarized-dark .ace_marker-layer .ace_selected-word { border: 1px solid #073642 } diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index e56c0430..062c5e63 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -11,7 +11,7 @@ color: #333 } -.ace-solarized-light .ace_print_margin { +.ace-solarized-light .ace_print-margin { width: 1px; background: #e8e8e8 } @@ -51,15 +51,15 @@ border: 1px solid rgba(147, 161, 161, 0.50) } -.ace-solarized-light .ace_marker-layer .ace_active_line { +.ace-solarized-light .ace_marker-layer .ace_active-line { background: #EEE8D5 } -.ace-solarized-light .ace_gutter_active_line { +.ace-solarized-light .ace_gutter-active-line { background-color : #dcdcdc } -.ace-solarized-light .ace_marker-layer .ace_selected_word { +.ace-solarized-light .ace_marker-layer .ace_selected-word { border: 1px solid #073642 } diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index c328b3aa..e46c4cfc 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -11,7 +11,7 @@ color: #333; } -.ace-tm .ace_print_margin { +.ace-tm .ace_print-margin { width: 1px; background: #e8e8e8; } @@ -104,7 +104,7 @@ color: rgb(49, 132, 149); } -.ace-tm .ace_line .ace_xml_pe { +.ace-tm .ace_line .ace_xml-pe { color: rgb(104, 104, 91); } @@ -149,15 +149,15 @@ border: 1px solid rgb(192, 192, 192); } -.ace-tm .ace_marker-layer .ace_active_line { +.ace-tm .ace_marker-layer .ace_active-line { background: rgba(0, 0, 0, 0.07); } -.ace-tm .ace_gutter_active_line { +.ace-tm .ace_gutter-active-line { background-color : #dcdcdc; } -.ace-tm .ace_marker-layer .ace_selected_word { +.ace-tm .ace_marker-layer .ace_selected-word { background: rgb(250, 250, 255); border: 1px solid rgb(200, 200, 250); } diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index c4511eeb..0d4b5c1e 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -11,7 +11,7 @@ color: #4D4D4C } -.ace-tomorrow .ace_print_margin { +.ace-tomorrow .ace_print-margin { width: 1px; background: #f6f6f6 } @@ -51,15 +51,15 @@ border: 1px solid #D1D1D1 } -.ace-tomorrow .ace_marker-layer .ace_active_line { +.ace-tomorrow .ace_marker-layer .ace_active-line { background: #EFEFEF } -.ace-tomorrow .ace_gutter_active_line { +.ace-tomorrow .ace_gutter-active-line { background-color : #dcdcdc } -.ace-tomorrow .ace_marker-layer .ace_selected_word { +.ace-tomorrow .ace_marker-layer .ace_selected-word { border: 1px solid #D6D6D6 } diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index ec96fdcc..a0f907cd 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -11,7 +11,7 @@ color: #C5C8C6 } -.ace-tomorrow-night .ace_print_margin { +.ace-tomorrow-night .ace_print-margin { width: 1px; background: #25282c } @@ -51,15 +51,15 @@ border: 1px solid #4B4E55 } -.ace-tomorrow-night .ace_marker-layer .ace_active_line { +.ace-tomorrow-night .ace_marker-layer .ace_active-line { background: #282A2E } -.ace-tomorrow-night .ace_gutter_active_line { +.ace-tomorrow-night .ace_gutter-active-line { background-color: #282A2E } -.ace-tomorrow-night .ace_marker-layer .ace_selected_word { +.ace-tomorrow-night .ace_marker-layer .ace_selected-word { border: 1px solid #373B41 } diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index bd77e5af..4272045a 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -11,7 +11,7 @@ color: #7388b5 } -.ace-tomorrow-night-blue .ace_print_margin { +.ace-tomorrow-night-blue .ace_print-margin { width: 1px; background: #00204b } @@ -52,15 +52,15 @@ border: 1px solid #404F7D } -.ace-tomorrow-night-blue .ace_marker-layer .ace_active_line { +.ace-tomorrow-night-blue .ace_marker-layer .ace_active-line { background: #00346E } -.ace-tomorrow-night-blue .ace_gutter_active_line { +.ace-tomorrow-night-blue .ace_gutter-active-line { background-color: #022040 } -.ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word { +.ace-tomorrow-night-blue .ace_marker-layer .ace_selected-word { border: 1px solid #003F8E } diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 18860611..0b8c88db 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -11,7 +11,7 @@ color: #DEDEDE } -.ace-tomorrow-night-bright .ace_print_margin { +.ace-tomorrow-night-bright .ace_print-margin { width: 1px; background: #1a1a1a } @@ -51,15 +51,15 @@ border: 1px solid #343434 } -.ace-tomorrow-night-bright .ace_marker-layer .ace_active_line { +.ace-tomorrow-night-bright .ace_marker-layer .ace_active-line { background: #2A2A2A } -.ace-tomorrow-night-bright .ace_gutter_active_line { +.ace-tomorrow-night-bright .ace_gutter-active-line { background-color: #2A2A2A } -.ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word { +.ace-tomorrow-night-bright .ace_marker-layer .ace_selected-word { border: 1px solid #424242 } diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index dfc38b64..ef9ba4fc 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -11,7 +11,7 @@ color: #CCC } -.ace-tomorrow-night-eighties .ace_print_margin { +.ace-tomorrow-night-eighties .ace_print-margin { width: 1px; background: #272727 } @@ -52,15 +52,15 @@ border: 1px solid #6A6A6A } -.ace-tomorrow-night-eighties .ace_marker-layer .ace_active_line { +.ace-tomorrow-night-eighties .ace_marker-layer .ace_active-line { background: #393939 } -.ace-tomorrow-night-eighties .ace_gutter_active_line { +.ace-tomorrow-night-eighties .ace_gutter-active-line { background-color: #393939 } -.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word { +.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected-word { border: 1px solid #515151 } diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index 0d943563..6f452147 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -11,7 +11,7 @@ color: #E2E2E2 } -.ace-twilight .ace_print_margin { +.ace-twilight .ace_print-margin { width: 1px; background: #232323 } @@ -51,15 +51,15 @@ border: 1px solid rgba(255, 255, 255, 0.25) } -.ace-twilight .ace_marker-layer .ace_active_line { +.ace-twilight .ace_marker-layer .ace_active-line { background: rgba(255, 255, 255, 0.031) } -.ace-twilight .ace_gutter_active_line { +.ace-twilight .ace_gutter-active-line { background-color: rgba(255, 255, 255, 0.031) } -.ace-twilight .ace_marker-layer .ace_selected_word { +.ace-twilight .ace_marker-layer .ace_selected-word { border: 1px solid rgba(221, 240, 255, 0.20) } @@ -133,7 +133,7 @@ color: #7587A6 } -.ace-twilight .ace_xml_pe { +.ace-twilight .ace_xml-pe { color: #494949 } diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css index 10481153..14d5b4f0 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -11,7 +11,7 @@ color: #BEBEBE } -.ace-vibrant-ink .ace_print_margin { +.ace-vibrant-ink .ace_print-margin { width: 1px; background: #1a1a1a } @@ -51,15 +51,15 @@ border: 1px solid #404040 } -.ace-vibrant-ink .ace_marker-layer .ace_active_line { +.ace-vibrant-ink .ace_marker-layer .ace_active-line { background: #333333 } -.ace-vibrant-ink .ace_gutter_active_line { +.ace-vibrant-ink .ace_gutter-active-line { background-color: #333333 } -.ace-vibrant-ink .ace_marker-layer .ace_selected_word { +.ace-vibrant-ink .ace_marker-layer .ace_selected-word { border: 1px solid #6699CC } diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css index 4ff0646a..00916e18 100644 --- a/lib/ace/theme/xcode.css +++ b/lib/ace/theme/xcode.css @@ -12,7 +12,7 @@ color: #333 } -.ace-xcode .ace_print_margin { +.ace-xcode .ace_print-margin { width: 1px; background: #e8e8e8 } @@ -52,15 +52,15 @@ border: 1px solid #BFBFBF } -.ace-xcode .ace_marker-layer .ace_active_line { +.ace-xcode .ace_marker-layer .ace_active-line { background: rgba(0, 0, 0, 0.071) } -.ace-xcode .ace_gutter_active_line { +.ace-xcode .ace_gutter-active-line { background-color: rgba(0, 0, 0, 0.071) } -.ace-xcode .ace_marker-layer .ace_selected_word { +.ace-xcode .ace_marker-layer .ace_selected-word { border: 1px solid #B5D5FF } diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 5ec1ffc5..2385a568 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -484,7 +484,7 @@ var VirtualRenderer = function(container, theme) { if (!this.$gutterLineHighlight) { this.$gutterLineHighlight = dom.createElement("div"); - this.$gutterLineHighlight.className = "ace_gutter_active_line"; + this.$gutterLineHighlight.className = "ace_gutter-active-line"; this.$gutter.appendChild(this.$gutterLineHighlight); return; } @@ -512,9 +512,9 @@ var VirtualRenderer = function(container, theme) { if (!this.$printMarginEl) { containerEl = dom.createElement("div"); - containerEl.className = "ace_print_margin_layer"; + containerEl.className = "ace_print-margin-layer"; this.$printMarginEl = dom.createElement("div"); - this.$printMarginEl.className = "ace_print_margin"; + this.$printMarginEl.className = "ace_print-margin"; containerEl.appendChild(this.$printMarginEl); this.content.insertBefore(containerEl, this.$textLayer.element); } diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 0610485f..757819ab 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -13,7 +13,7 @@ color: #333; } -.%cssClass% .ace_print_margin { +.%cssClass% .ace_print-margin { width: 1px; background: %printMargin%; } @@ -53,15 +53,15 @@ border: 1px solid %bracket%; } -.%cssClass% .ace_marker-layer .ace_active_line { +.%cssClass% .ace_marker-layer .ace_active-line { background: %active_line%; } -.%cssClass% .ace_gutter_active_line { +.%cssClass% .ace_gutter-active-line { background-color: %active_line%; } -.%cssClass% .ace_marker-layer .ace_selected_word { +.%cssClass% .ace_marker-layer .ace_selected-word { %selected_word_highlight% } diff --git a/tool/tmtheme.js b/tool/tmtheme.js index 9480c0a2..39570e05 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -60,7 +60,7 @@ var supportedScopes = { "variable.parameter": "variable.parameter", "meta": "meta", - "meta.tag.sgml.doctype": "xml_pe", + "meta.tag.sgml.doctype": "xml-pe", "meta.tag": "meta.tag", "meta.selector": "meta.selector",