From ddb40420cdfef819628105ad8afbd4edeeeca548 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 16:35:23 +1000 Subject: [PATCH 01/17] add css-class to textarea --- lib/ace/css/editor.css | 4 ++-- lib/ace/keyboard/textinput.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 015cff6c..7e0c3a76 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -90,7 +90,7 @@ height: 100%; } -.ace_editor > textarea { +.ace_text-input { position: absolute; z-index: 0; width: 0.5em; @@ -105,7 +105,7 @@ overflow: hidden; } -.ace_editor > textarea.ace_composition { +.ace_text-input.ace_composition { background: #fff; color: #000; z-index: 1000; diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js index e41f3152..b8889fb1 100644 --- a/lib/ace/keyboard/textinput.js +++ b/lib/ace/keyboard/textinput.js @@ -37,6 +37,7 @@ var dom = require("../lib/dom"); var TextInput = function(parentNode, host) { var text = dom.createElement("textarea"); + text.className = "ace_text-input"; /*/ debug text.style.opacity = 1 text.style.background = "rgba(0, 250, 0, 0.3)" From 15c5290aec6b277b08800b33ec83f2b5fc28739b Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 16:50:23 +1000 Subject: [PATCH 02/17] 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", From 936d0773896774dbea7ae9e0c27873f459214a5b Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 17:02:03 +1000 Subject: [PATCH 03/17] Rename ace_sb to ace_scrollbar --- lib/ace/css/editor.css | 4 ++-- lib/ace/scrollbar.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index bd880d10..e03fe191 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -62,14 +62,14 @@ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGRTk5MTVGREIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGRTk5MTVGRUIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZFOTkxNUZCQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFOTkxNUZDQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+SIDkjAAAAJ1JREFUeNpi/P//PwMlgImBQkB7A6qrq/+DMC55FkIGKCoq4pVnpFkgTp069f/+/fv/r1u37r+tre1/kg0A+ptn9uzZYLaRkRHpLvjw4cNXWVlZhufPnzOcO3eOdAO0tbVPAjHDmzdvGA4fPsxIsgGSkpJmv379Ynj37h2DjIyMCMkG3LhxQ/T27dsMampqDHZ2dq/pH41DxwCAAAMAFdc68dUsFZgAAAAASUVORK5CYII="); } -.ace_editor .ace_sb { +.ace_editor .ace_scrollbar { position: absolute; overflow-x: hidden; overflow-y: scroll; right: 0; } -.ace_editor .ace_sb div { +.ace_editor .ace_scrollbar-inner { position: absolute; width: 1px; left: 0; diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index edb37ea9..ada4d023 100644 --- a/lib/ace/scrollbar.js +++ b/lib/ace/scrollbar.js @@ -52,9 +52,10 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter; **/ var ScrollBar = function(parent) { this.element = dom.createElement("div"); - this.element.className = "ace_sb"; + this.element.className = "ace_scrollbar"; this.inner = dom.createElement("div"); + this.inner.className = "ace_scrollbar-inner"; this.element.appendChild(this.inner); parent.appendChild(this.element); From d8e60f9f4bb528d9af6f43ea8f07c765f5e9538e Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 17:06:40 +1000 Subject: [PATCH 04/17] Vendor-prefixed css-properties should go before standart. --- lib/ace/css/editor.css | 14 +++++++------- lib/ace/keyboard/emacs.js | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index e03fe191..341c3c87 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -12,9 +12,9 @@ .ace_content { position: absolute; - box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + box-sizing: border-box; cursor: text; } @@ -97,8 +97,8 @@ height: 1em; opacity: 0; background: transparent; - appearance: none; -moz-appearance: none; + appearance: none; border: none; resize: none; outline: none; @@ -121,9 +121,9 @@ white-space: nowrap; height: 100%; width: 100%; - box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + box-sizing: border-box; /* setting pointer-events: auto; on node under the mouse, which changes during scroll, will break mouse wheel scrolling in Safari */ pointer-events: none; @@ -190,15 +190,15 @@ .ace_marker-layer .ace_selected-word { position: absolute; z-index: 4; - box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + box-sizing: border-box; } .ace_line .ace_fold { - box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + box-sizing: border-box; display: inline-block; height: 11px; @@ -245,9 +245,9 @@ padding: 4px; position: absolute; z-index: 300; - box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + box-sizing: border-box; cursor: default; } @@ -256,9 +256,9 @@ } .ace_fold-widget { - box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + box-sizing: border-box; margin: 0 -12px 0 1px; display: inline-block; diff --git a/lib/ace/keyboard/emacs.js b/lib/ace/keyboard/emacs.js index 4c6173e9..a1248759 100644 --- a/lib/ace/keyboard/emacs.js +++ b/lib/ace/keyboard/emacs.js @@ -57,6 +57,7 @@ exports.handler.attach = function(editor) { .emacs-mode .ace_cursor{\ border: 2px rgba(50,250,50,0.8) solid!important;\ -moz-box-sizing: border-box!important;\ + -webkit-box-sizing: border-box!important;\ box-sizing: border-box!important;\ background-color: rgba(0,250,0,0.9);\ opacity: 0.5;\ From 911e0a8eac37d2fedd6afea2e5c3b7c30d3aba0a Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 17:13:55 +1000 Subject: [PATCH 05/17] Simplify some of selectors in editor.css --- lib/ace/css/editor.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 341c3c87..87f68158 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -62,20 +62,20 @@ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGRTk5MTVGREIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGRTk5MTVGRUIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZFOTkxNUZCQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFOTkxNUZDQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+SIDkjAAAAJ1JREFUeNpi/P//PwMlgImBQkB7A6qrq/+DMC55FkIGKCoq4pVnpFkgTp069f/+/fv/r1u37r+tre1/kg0A+ptn9uzZYLaRkRHpLvjw4cNXWVlZhufPnzOcO3eOdAO0tbVPAjHDmzdvGA4fPsxIsgGSkpJmv379Ynj37h2DjIyMCMkG3LhxQ/T27dsMampqDHZ2dq/pH41DxwCAAAMAFdc68dUsFZgAAAAASUVORK5CYII="); } -.ace_editor .ace_scrollbar { +.ace_scrollbar { position: absolute; overflow-x: hidden; overflow-y: scroll; right: 0; } -.ace_editor .ace_scrollbar-inner { +.ace_scrollbar-inner { position: absolute; width: 1px; left: 0; } -.ace_editor .ace_print-margin-layer { +.ace_print-margin-layer { z-index: 0; position: absolute; overflow: hidden; @@ -85,7 +85,7 @@ width: 100%; } -.ace_editor .ace_print-margin { +.ace_print-margin { position: absolute; height: 100%; } @@ -129,7 +129,7 @@ pointer-events: none; } -.ace_gutter .ace_layer { +.ace_gutter-layer { position: relative; width: auto; text-align: right; @@ -232,7 +232,7 @@ background-position: center center, top left; } -.ace_dragging .ace_content { +.ace_editor.ace_dragging .ace_content { cursor: move; } From 6576190b535aee3dfa7e0cfeaef935e70c44b550 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 17:15:28 +1000 Subject: [PATCH 06/17] Add forgotten ace_layer class to ace_print-margin-layer --- lib/ace/css/editor.css | 10 ---------- lib/ace/virtual_renderer.js | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 87f68158..b9eb5946 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -75,16 +75,6 @@ left: 0; } -.ace_print-margin-layer { - z-index: 0; - position: absolute; - overflow: hidden; - margin: 0; - left: 0; - height: 100%; - width: 100%; -} - .ace_print-margin { position: absolute; height: 100%; diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 2385a568..7fc408ae 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -512,7 +512,7 @@ var VirtualRenderer = function(container, theme) { if (!this.$printMarginEl) { containerEl = dom.createElement("div"); - containerEl.className = "ace_print-margin-layer"; + containerEl.className = "ace_layer ace_print-margin-layer"; this.$printMarginEl = dom.createElement("div"); this.$printMarginEl.className = "ace_print-margin"; containerEl.appendChild(this.$printMarginEl); From 489afda3ba324ce6de6b7e5961e1da172646f337 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 17:21:35 +1000 Subject: [PATCH 07/17] Fix box-model of the cursor --- lib/ace/css/editor.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index b9eb5946..749c4f6b 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -143,6 +143,9 @@ .ace_cursor { z-index: 4; position: absolute; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } .ace_cursor.ace_hidden { From 7e81913058ccd5f62e35db09b082521c764a9b74 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 17:47:15 +1000 Subject: [PATCH 08/17] rename .horscroll to .ace_scroll-left --- lib/ace/css/editor.css | 2 +- lib/ace/virtual_renderer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 749c4f6b..5057618f 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -33,7 +33,7 @@ right: 0; } -.ace_scroller.horscroll { +.ace_scroller.ace_scroll-left { box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset; } diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 7fc408ae..026107c1 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -686,7 +686,7 @@ var VirtualRenderer = function(container, theme) { this.scrollLeft = scrollLeft; this.session.setScrollLeft(scrollLeft); - this.scroller.className = this.scrollLeft == 0 ? "ace_scroller" : "ace_scroller horscroll"; + this.scroller.className = this.scrollLeft == 0 ? "ace_scroller" : "ace_scroller ace_scroll-left"; } // full From e61d4c21f20c2bd8f0e4aba7fc5e00946ae20b90 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 18:09:12 +1000 Subject: [PATCH 09/17] Prefix foldWidget state css-classes --- lib/ace/css/editor.css | 10 +++++----- lib/ace/layer/gutter.js | 4 ++-- lib/ace/theme/ambiance.css | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 5057618f..5a748eba 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -267,11 +267,11 @@ border: 1px solid transparent; } -.ace_fold-widget.end { +.ace_fold-widget.ace_end { background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82"); } -.ace_fold-widget.closed { +.ace_fold-widget.ace_closed { background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82"); } @@ -296,10 +296,10 @@ .ace_dark .ace_fold-widget { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC"); } -.ace_dark .ace_fold-widget.end { +.ace_dark .ace_fold-widget.ace_end { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg=="); } -.ace_dark .ace_fold-widget.closed { +.ace_dark .ace_fold-widget.ace_closed { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg=="); } .ace_dark .ace_fold-widget:hover { @@ -314,7 +314,7 @@ -.ace_fold-widget.invalid { +.ace_fold-widget.ace_invalid { background-color: #FFB4B4; border-color: #DE5555; } diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js index be34f3c9..f04c317f 100644 --- a/lib/ace/layer/gutter.js +++ b/lib/ace/layer/gutter.js @@ -129,8 +129,8 @@ var Gutter = function(parentEl) { c = foldWidgets[i] = this.session.getFoldWidget(i); if (c) html.push( - "" ); diff --git a/lib/ace/theme/ambiance.css b/lib/ace/theme/ambiance.css index c7dfa72c..6db015ec 100644 --- a/lib/ace/theme/ambiance.css +++ b/lib/ace/theme/ambiance.css @@ -52,11 +52,11 @@ color: #777; } -.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.open:after { +.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.ace_open:after { content: '▾' } -.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.closed:after { +.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.ace_closed:after { content: '‣' } From 0490b34fe268deb443087f4d9a3b9b845bfe6bd7 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 18:13:59 +1000 Subject: [PATCH 10/17] Rename multiselect to ace_multiselect --- lib/ace/css/editor.css | 2 +- lib/ace/multi_select.js | 4 ++-- lib/ace/theme/clouds.css | 2 +- lib/ace/theme/clouds_midnight.css | 2 +- lib/ace/theme/cobalt.css | 2 +- lib/ace/theme/dawn.css | 2 +- lib/ace/theme/github.css | 2 +- lib/ace/theme/idle_fingers.css | 2 +- lib/ace/theme/kr_theme.css | 2 +- lib/ace/theme/merbivore.css | 2 +- lib/ace/theme/merbivore_soft.css | 2 +- lib/ace/theme/mono_industrial.css | 2 +- lib/ace/theme/monokai.css | 2 +- lib/ace/theme/pastel_on_dark.css | 2 +- lib/ace/theme/solarized_dark.css | 2 +- lib/ace/theme/solarized_light.css | 2 +- lib/ace/theme/textmate.css | 2 +- lib/ace/theme/tomorrow.css | 2 +- lib/ace/theme/tomorrow_night.css | 2 +- lib/ace/theme/tomorrow_night_blue.css | 2 +- lib/ace/theme/tomorrow_night_bright.css | 2 +- lib/ace/theme/tomorrow_night_eighties.css | 2 +- lib/ace/theme/twilight.css | 2 +- lib/ace/theme/vibrant_ink.css | 2 +- lib/ace/theme/xcode.css | 2 +- tool/Theme.tmpl.css | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 5a748eba..081a1b0f 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -152,7 +152,7 @@ opacity: 0.2; } -.ace_editor.multiselect .ace_cursor { +.ace_editor.ace_multiselect .ace_cursor { border-left-width: 1px; } diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js index 857ffba0..547463ad 100644 --- a/lib/ace/multi_select.js +++ b/lib/ace/multi_select.js @@ -399,7 +399,7 @@ var Editor = require("./editor").Editor; return; this.inMultiSelectMode = true; - this.setStyle("multiselect"); + this.setStyle("ace_multiselect"); this.keyBinding.addKeyboardHandler(commands.keyboardHandler); this.commands.on("exec", this.$onMultiSelectExec); @@ -412,7 +412,7 @@ var Editor = require("./editor").Editor; return; this.inMultiSelectMode = false; - this.unsetStyle("multiselect"); + this.unsetStyle("ace_multiselect"); this.keyBinding.removeKeyboardHandler(commands.keyboardHandler); this.commands.removeEventListener("exec", this.$onMultiSelectExec); diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index 4167e3ef..6877cfd1 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -37,7 +37,7 @@ background: #BDD5FC } -.ace-clouds.multiselect .ace_selection.start { +.ace-clouds.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #FFFFFF; border-radius: 2px } diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index c4415713..4e9fa38b 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -37,7 +37,7 @@ background: #000000 } -.ace-clouds-midnight.multiselect .ace_selection.start { +.ace-clouds-midnight.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #191919; border-radius: 2px } diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index 67c49845..8c15197c 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -37,7 +37,7 @@ background: rgba(179, 101, 57, 0.75) } -.ace-cobalt.multiselect .ace_selection.start { +.ace-cobalt.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #002240; border-radius: 2px } diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index e5692b45..9adf5960 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -37,7 +37,7 @@ background: rgba(39, 95, 255, 0.30) } -.ace-dawn.multiselect .ace_selection.start { +.ace-dawn.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #F9F9F9; border-radius: 2px } diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css index e9755423..3ff665d6 100644 --- a/lib/ace/theme/github.css +++ b/lib/ace/theme/github.css @@ -94,7 +94,7 @@ .ace-github .ace_marker-layer .ace_selection { background: rgb(181, 213, 255); } -.ace-github.multiselect .ace_selection.start { +.ace-github.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px white; border-radius: 2px; } diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index 0cd4849f..e07d20ad 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -37,7 +37,7 @@ background: rgba(90, 100, 126, 0.88) } -.ace-idle-fingers.multiselect .ace_selection.start { +.ace-idle-fingers.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #323232; border-radius: 2px } diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index b4d5a4b4..37dec825 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -37,7 +37,7 @@ background: rgba(170, 0, 255, 0.45) } -.ace-kr-theme.multiselect .ace_selection.start { +.ace-kr-theme.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #0B0A09; border-radius: 2px } diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index 2c0504a9..e5732f78 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -37,7 +37,7 @@ background: #454545 } -.ace-merbivore.multiselect .ace_selection.start { +.ace-merbivore.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #161616; border-radius: 2px } diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index c7e0cc1f..333348fc 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -37,7 +37,7 @@ background: #494949 } -.ace-merbivore-soft.multiselect .ace_selection.start { +.ace-merbivore-soft.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #1C1C1C; border-radius: 2px } diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 43a11ae7..9f56cdf8 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -37,7 +37,7 @@ background: rgba(145, 153, 148, 0.40) } -.ace-mono-industrial.multiselect .ace_selection.start { +.ace-mono-industrial.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #222C28; border-radius: 2px } diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 9ffd189b..7f0de488 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -37,7 +37,7 @@ background: #49483E } -.ace-monokai.multiselect .ace_selection.start { +.ace-monokai.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #272822; border-radius: 2px } diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index 57e83356..cbf3f43f 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -37,7 +37,7 @@ background: rgba(221, 240, 255, 0.20) } -.ace-pastel-on-dark.multiselect .ace_selection.start { +.ace-pastel-on-dark.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #2C2828; border-radius: 2px } diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 8f802a9f..f870db7d 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -40,7 +40,7 @@ background: rgba(255, 255, 255, 0.1) } -.ace-solarized-dark.multiselect .ace_selection.start { +.ace-solarized-dark.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #002B36; border-radius: 2px } diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index 062c5e63..3dd8098d 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -37,7 +37,7 @@ background: #073642 } -.ace-solarized-light.multiselect .ace_selection.start { +.ace-solarized-light.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #FDF6E3; border-radius: 2px } diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index e46c4cfc..eca40750 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -132,7 +132,7 @@ .ace-tm .ace_marker-layer .ace_selection { background: rgb(181, 213, 255); } -.ace-tm.multiselect .ace_selection.start { +.ace-tm.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px white; border-radius: 2px; } diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index 0d4b5c1e..fb95693b 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -37,7 +37,7 @@ background: #D6D6D6 } -.ace-tomorrow.multiselect .ace_selection.start { +.ace-tomorrow.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #FFFFFF; border-radius: 2px } diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index a0f907cd..f044a623 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -37,7 +37,7 @@ background: #373B41 } -.ace-tomorrow-night.multiselect .ace_selection.start { +.ace-tomorrow-night.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #1D1F21; border-radius: 2px } diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index 4272045a..975646ec 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -38,7 +38,7 @@ background: #003F8E } -.ace-tomorrow-night-blue.multiselect .ace_selection.start { +.ace-tomorrow-night-blue.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #002451; border-radius: 2px } diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 0b8c88db..56e915f1 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -37,7 +37,7 @@ background: #424242 } -.ace-tomorrow-night-bright.multiselect .ace_selection.start { +.ace-tomorrow-night-bright.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #000000; border-radius: 2px } diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index ef9ba4fc..6e040685 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -38,7 +38,7 @@ background: #515151 } -.ace-tomorrow-night-eighties.multiselect .ace_selection.start { +.ace-tomorrow-night-eighties.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #2D2D2D; border-radius: 2px } diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index 6f452147..86a0f95b 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -37,7 +37,7 @@ background: rgba(221, 240, 255, 0.20) } -.ace-twilight.multiselect .ace_selection.start { +.ace-twilight.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #141414; border-radius: 2px } diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css index 14d5b4f0..f4eafc0b 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -37,7 +37,7 @@ background: #6699CC } -.ace-vibrant-ink.multiselect .ace_selection.start { +.ace-vibrant-ink.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #0F0F0F; border-radius: 2px } diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css index 00916e18..86d141e3 100644 --- a/lib/ace/theme/xcode.css +++ b/lib/ace/theme/xcode.css @@ -38,7 +38,7 @@ background: #B5D5FF } -.ace-xcode.multiselect .ace_selection.start { +.ace-xcode.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px #FFFFFF; border-radius: 2px } diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 757819ab..447c88e1 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -39,7 +39,7 @@ background: %selection%; } -.%cssClass%.multiselect .ace_selection.start { +.%cssClass%.ace_multiselect .ace_selection.start { box-shadow: 0 0 3px 0px %background%; border-radius: 2px; } From fe5aa98fc55d525ae811c362b45c022d97fee2cb Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 18:43:59 +1000 Subject: [PATCH 11/17] rename .start to .ace_start for selection markers --- lib/ace/layer/marker.js | 6 +++--- lib/ace/theme/clouds.css | 2 +- lib/ace/theme/clouds_midnight.css | 2 +- lib/ace/theme/cobalt.css | 2 +- lib/ace/theme/dawn.css | 2 +- lib/ace/theme/github.css | 2 +- lib/ace/theme/idle_fingers.css | 2 +- lib/ace/theme/kr_theme.css | 2 +- lib/ace/theme/merbivore.css | 2 +- lib/ace/theme/merbivore_soft.css | 2 +- lib/ace/theme/mono_industrial.css | 2 +- lib/ace/theme/monokai.css | 2 +- lib/ace/theme/pastel_on_dark.css | 2 +- lib/ace/theme/solarized_dark.css | 2 +- lib/ace/theme/solarized_light.css | 2 +- lib/ace/theme/textmate.css | 2 +- lib/ace/theme/tomorrow.css | 2 +- lib/ace/theme/tomorrow_night.css | 2 +- lib/ace/theme/tomorrow_night_blue.css | 2 +- lib/ace/theme/tomorrow_night_bright.css | 2 +- lib/ace/theme/tomorrow_night_eighties.css | 2 +- lib/ace/theme/twilight.css | 2 +- lib/ace/theme/vibrant_ink.css | 2 +- lib/ace/theme/xcode.css | 2 +- tool/Theme.tmpl.css | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/ace/layer/marker.js b/lib/ace/layer/marker.js index ee83cf5d..7470bfd7 100644 --- a/lib/ace/layer/marker.js +++ b/lib/ace/layer/marker.js @@ -95,7 +95,7 @@ var Marker = function(parentEl) { } else { this.drawSingleLineMarker( - html, range, marker.clazz + " start", config, + html, range, marker.clazz + " ace_start", config, null, marker.type ); } @@ -116,7 +116,7 @@ var Marker = function(parentEl) { row, range.start.column, row, this.session.getScreenLastRowColumn(row) ); - this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " start", layerConfig, 1, "text"); + this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " ace_start", layerConfig, 1, "text"); // selection end row = range.end.row; @@ -140,7 +140,7 @@ var Marker = function(parentEl) { var left = Math.round(padding + range.start.column * config.characterWidth); stringBuilder.push( - "
Date: Mon, 1 Oct 2012 18:56:10 +1000 Subject: [PATCH 13/17] Place print_margin_layer before other layers --- lib/ace/virtual_renderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 026107c1..edeca89e 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -516,7 +516,7 @@ var VirtualRenderer = function(container, theme) { this.$printMarginEl = dom.createElement("div"); this.$printMarginEl.className = "ace_print-margin"; containerEl.appendChild(this.$printMarginEl); - this.content.insertBefore(containerEl, this.$textLayer.element); + this.content.insertBefore(containerEl, this.content.firstChild); } var style = this.$printMarginEl.style; From b30c087fac0d46b23e8a39e678d50c11dd33566e Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 19:13:05 +1000 Subject: [PATCH 14/17] Fix css-selector in vim/maps/util --- lib/ace/keyboard/vim/maps/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/keyboard/vim/maps/util.js b/lib/ace/keyboard/vim/maps/util.js index 1e8b3e2f..1d5a7639 100644 --- a/lib/ace/keyboard/vim/maps/util.js +++ b/lib/ace/keyboard/vim/maps/util.js @@ -2,7 +2,7 @@ define(function(require, exports, module) { var registers = require("../registers"); var dom = require("../../../lib/dom"); -dom.importCssString('.insert-mode. ace_cursor{\ +dom.importCssString('.insert-mode .ace_cursor{\ border-left: 2px solid #333333;\ }\ .ace_dark.insert-mode .ace_cursor{\ From 42b6ac75d6185985a5f9a83bd35e93c4b2110dba Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 19:13:37 +1000 Subject: [PATCH 15/17] Fix css-selector in chrome theme (trailing comma) --- lib/ace/theme/chrome.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index 8b0c8c8f..069a4b37 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -56,7 +56,7 @@ .ace-chrome .ace_line .ace_support.ace_type, .ace-chrome .ace_line .ace_support.ace_class -.ace-chrome .ace_line .ace_support.ace_other, { +.ace-chrome .ace_line .ace_support.ace_other { color: rgb(109, 121, 222); } From 2b7b07f02d3eacee0c1c7e4b7b2b1f4e3781be24 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Mon, 1 Oct 2012 19:15:00 +1000 Subject: [PATCH 16/17] Fix github theme mistype and remove strange font-weight hard reset --- lib/ace/theme/github.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css index cdbcc52c..3dc69b27 100644 --- a/lib/ace/theme/github.css +++ b/lib/ace/theme/github.css @@ -55,7 +55,7 @@ font-weight: normal; } -.ace-github .ace_variable.ace_instancce { +.ace-github .ace_variable.ace_instance { color: teal; } @@ -78,18 +78,15 @@ .ace-github .ace_marker-layer .ace_active-line { background: rgb(255, 255, 204); } + .ace-github .ace_marker-layer .ace_selection { background: rgb(181, 213, 255); } + .ace-github.ace_multiselect .ace_selection.ace_start { box-shadow: 0 0 3px 0px white; border-radius: 2px; } -/* bold keywords cause cursor issues for some fonts */ -/* this disables bold style for editor and keeps for static highlighter */ -.ace-github.ace_editor .ace_line > span { - font-weight: normal !important; -} .ace-github .ace_marker-layer .ace_step { background: rgb(252, 255, 0); From e4d7fc17a6f86db2583adc837c05d2735eb8cbf6 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Tue, 2 Oct 2012 00:12:28 +1000 Subject: [PATCH 17/17] Ambiance theme fixes --- lib/ace/theme/ambiance.css | 48 ++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/lib/ace/theme/ambiance.css b/lib/ace/theme/ambiance.css index a9cd0fd6..65a25bbd 100644 --- a/lib/ace/theme/ambiance.css +++ b/lib/ace/theme/ambiance.css @@ -1,4 +1,5 @@ .ace-ambiance .ace_gutter { + background-color: #3d3d3d; background-image: -moz-linear-gradient(left, #3D3D3D, #333); background-image: -ms-linear-gradient(left, #3D3D3D, #333); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3D3D3D), to(#333)); @@ -6,51 +7,46 @@ background-image: -o-linear-gradient(left, #3D3D3D, #333); background-image: linear-gradient(left, #3D3D3D, #333); background-repeat: repeat-x; - + border-right: 1px solid #4d4d4d; text-shadow: 0px 1px 1px #4d4d4d; color: #222; - border-right: 1px solid #4d4d4d; - overflow : hidden; } .ace-ambiance .ace_gutter-layer { background: repeat left top; - width: 100%; - text-align: right; } -.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget { - position: absolute; - right: 2px; - margin: 0; - vertical-align: middle; - height: inherit; - width: auto; +.ace-ambiance .ace_fold-widget { + text-align: center; +} + +.ace-ambiance .ace_fold-widget:hover { + color: #777; +} + +.ace-ambiance .ace_fold-widget.ace_start, +.ace-ambiance .ace_fold-widget.ace_end, +.ace-ambiance .ace_fold-widget.ace_closed{ background: none; border: none; box-shadow: none; - outline: none; } -.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget:hover { - color: #777; -} - -.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget:hover { - color: #777; -} - -.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.ace_open:after { +.ace-ambiance .ace_fold-widget.ace_start:after { content: '▾' } -.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.ace_closed:after { +.ace-ambiance .ace_fold-widget.ace_end:after { + content: '▴' +} + +.ace-ambiance .ace_fold-widget.ace_closed:after { content: '‣' } .ace-ambiance .ace_print-margin { border-left: 1px dotted #2D2D2D; - width: 100%; + right: 0; background: #262626; } @@ -63,9 +59,7 @@ } .ace-ambiance .ace_text-layer { - cursor: text; color: #E6E1DC; - background: url("noise.png") repeat left top; } .ace-ambiance .ace_cursor { @@ -104,8 +98,6 @@ background: rgba(255, 255, 255, 0.031); } - - .ace-ambiance .ace_invisible { color: #333; }