From b4f8e47fe3b455281c4d2eb0b0cad9181e03fa4e Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 8 Sep 2013 23:59:53 +0400 Subject: [PATCH] fix slim cursor setting --- lib/ace/css/editor.css | 10 ++++++++++ lib/ace/keyboard/emacs.js | 2 +- lib/ace/theme/chrome.css | 7 +------ lib/ace/theme/clouds.css | 7 +------ lib/ace/theme/clouds_midnight.css | 7 +------ lib/ace/theme/cobalt.css | 7 +------ lib/ace/theme/crimson_editor.css | 7 +------ lib/ace/theme/dawn.css | 7 +------ lib/ace/theme/dreamweaver.css | 7 +------ lib/ace/theme/eclipse.css | 2 +- lib/ace/theme/github.css | 7 +------ lib/ace/theme/idle_fingers.css | 7 +------ lib/ace/theme/kr_theme.css | 7 +------ lib/ace/theme/merbivore.css | 7 +------ lib/ace/theme/merbivore_soft.css | 7 +------ lib/ace/theme/mono_industrial.css | 7 +------ lib/ace/theme/monokai.css | 7 +------ lib/ace/theme/pastel_on_dark.css | 7 +------ lib/ace/theme/solarized_dark.css | 7 +------ lib/ace/theme/solarized_light.css | 7 +------ lib/ace/theme/terminal.css | 7 +------ lib/ace/theme/textmate.css | 7 +------ lib/ace/theme/tomorrow.css | 7 +------ lib/ace/theme/tomorrow_night.css | 7 +------ lib/ace/theme/tomorrow_night_blue.css | 7 +------ lib/ace/theme/tomorrow_night_bright.css | 7 +------ lib/ace/theme/tomorrow_night_eighties.css | 7 +------ lib/ace/theme/twilight.css | 7 +------ lib/ace/theme/vibrant_ink.css | 7 +------ lib/ace/theme/xcode.css | 7 +------ tool/theme.tmpl.css | 7 +------ tool/tmtheme.js | 1 - 32 files changed, 40 insertions(+), 171 deletions(-) diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index acea6f89..b7450b4e 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -167,6 +167,16 @@ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; + border-left: 2px solid +} + +.ace_slim-cursors .ace_cursor { + border-left-width: 1px; +} + +.ace_overwrite-cursors .ace_cursor { + border-left-width: 0px; + border-bottom: 1px solid; } .ace_hidden-cursors .ace_cursor { diff --git a/lib/ace/keyboard/emacs.js b/lib/ace/keyboard/emacs.js index 1cb84f59..a7350608 100644 --- a/lib/ace/keyboard/emacs.js +++ b/lib/ace/keyboard/emacs.js @@ -71,7 +71,7 @@ exports.handler.attach = function(editor) { background-color: rgba(0,250,0,0.9);\ opacity: 0.5;\ }\ - .emacs-mode .ace_cursor.ace_hidden{\ + .emacs-mode .ace_hidden-cursors .ace_cursor{\ opacity: 1;\ background-color: transparent;\ }\ diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index f7e65098..5130817d 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -14,12 +14,7 @@ } .ace-chrome .ace_cursor { - border-left: 2px solid black; -} - -.ace-chrome .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid black; + color: black; } .ace-chrome .ace_invisible { diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index 3424088b..e3884e02 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -14,12 +14,7 @@ } .ace-clouds .ace_cursor { - border-left: 2px solid #000000 -} - -.ace-clouds .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #000000 + color: #000000 } .ace-clouds .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index b84b6706..87e22465 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -14,12 +14,7 @@ } .ace-clouds-midnight .ace_cursor { - border-left: 2px solid #7DA5DC -} - -.ace-clouds-midnight .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #7DA5DC + color: #7DA5DC } .ace-clouds-midnight .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index 36608202..7febd9ac 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -14,12 +14,7 @@ } .ace-cobalt .ace_cursor { - border-left: 2px solid #FFFFFF -} - -.ace-cobalt .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #FFFFFF + color: #FFFFFF } .ace-cobalt .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/crimson_editor.css b/lib/ace/theme/crimson_editor.css index f8e9f653..e84292b4 100644 --- a/lib/ace/theme/crimson_editor.css +++ b/lib/ace/theme/crimson_editor.css @@ -20,12 +20,7 @@ } .ace-crimson-editor .ace_cursor { - border-left: 2px solid black; -} - -.ace-crimson-editor .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid black; + color: black; } .ace-crimson-editor .ace_invisible { diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index 3bbf33fe..c1a89e32 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -14,12 +14,7 @@ } .ace-dawn .ace_cursor { - border-left: 2px solid #000000 -} - -.ace-dawn .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #000000 + color: #000000 } .ace-dawn .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css index 949be9ca..595927b2 100644 --- a/lib/ace/theme/dreamweaver.css +++ b/lib/ace/theme/dreamweaver.css @@ -17,12 +17,7 @@ } .ace-dreamweaver .ace_cursor { - border-left: 2px solid black; -} - -.ace-dreamweaver .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid black; + color: black; } .ace-dreamweaver .ace_invisible { diff --git a/lib/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css index b1c84a74..6deec44b 100644 --- a/lib/ace/theme/eclipse.css +++ b/lib/ace/theme/eclipse.css @@ -18,7 +18,7 @@ } .ace-eclipse .ace_cursor { - border-left: 2px solid black; + color: black; } .ace-eclipse .ace_storage, diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css index 318824da..f496f6ee 100644 --- a/lib/ace/theme/github.css +++ b/lib/ace/theme/github.css @@ -65,12 +65,7 @@ } .ace-github .ace_cursor { - border-left: 2px solid black; -} - -.ace-github .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid black; + color: black; } .ace-github .ace_marker-layer .ace_active-line { diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index 640b9389..6a4d02d5 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -14,12 +14,7 @@ } .ace-idle-fingers .ace_cursor { - border-left: 2px solid #91FF00 -} - -.ace-idle-fingers .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #91FF00 + color: #91FF00 } .ace-idle-fingers .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index e9e336f5..ea030d30 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -14,12 +14,7 @@ } .ace-kr-theme .ace_cursor { - border-left: 2px solid #FF9900 -} - -.ace-kr-theme .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #FF9900 + color: #FF9900 } .ace-kr-theme .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index 5770ce3b..d0803d82 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -14,12 +14,7 @@ } .ace-merbivore .ace_cursor { - border-left: 2px solid #FFFFFF -} - -.ace-merbivore .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #FFFFFF + color: #FFFFFF } .ace-merbivore .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index 975493c6..7792440d 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -14,12 +14,7 @@ } .ace-merbivore-soft .ace_cursor { - border-left: 2px solid #FFFFFF -} - -.ace-merbivore-soft .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #FFFFFF + color: #FFFFFF } .ace-merbivore-soft .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 90aaf5d1..90531fa2 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -14,12 +14,7 @@ } .ace-mono-industrial .ace_cursor { - border-left: 2px solid #FFFFFF -} - -.ace-mono-industrial .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #FFFFFF + color: #FFFFFF } .ace-mono-industrial .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 2c7e3b0d..77d18fe2 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -14,12 +14,7 @@ } .ace-monokai .ace_cursor { - border-left: 2px solid #F8F8F0 -} - -.ace-monokai .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #F8F8F0 + color: #F8F8F0 } .ace-monokai .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index 6f54986b..9e876d4a 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -14,12 +14,7 @@ } .ace-pastel-on-dark .ace_cursor { - border-left: 2px solid #A7A7A7 -} - -.ace-pastel-on-dark .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #A7A7A7 + color: #A7A7A7 } .ace-pastel-on-dark .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 165bc3c8..1b55f29f 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -19,12 +19,7 @@ } .ace-solarized-dark .ace_cursor { - border-left: 2px solid #D30102 -} - -.ace-solarized-dark .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #D30102 + color: #D30102 } .ace-solarized-dark .ace_marker-layer .ace_active-line, diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index 3a99d732..c72a8d21 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -14,12 +14,7 @@ } .ace-solarized-light .ace_cursor { - border-left: 2px solid #000000 -} - -.ace-solarized-light .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #000000 + color: #000000 } .ace-solarized-light .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/terminal.css b/lib/ace/theme/terminal.css index 2bafcbc2..3636a03d 100644 --- a/lib/ace/theme/terminal.css +++ b/lib/ace/theme/terminal.css @@ -14,12 +14,7 @@ } .ace-terminal-theme .ace_cursor { - border-left: 2px solid springgreen -} - -.ace-terminal-theme .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #9F9F9F + color: #9F9F9F } .ace-terminal-theme .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index 43b8ed36..13c4e848 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -17,12 +17,7 @@ } .ace-tm .ace_cursor { - border-left: 2px solid black; -} - -.ace-tm .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid black; + color: black; } .ace-tm .ace_invisible { diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index 3776a944..3e59b8b5 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -14,12 +14,7 @@ } .ace-tomorrow .ace_cursor { - border-left: 2px solid #AEAFAD -} - -.ace-tomorrow .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #AEAFAD + color: #AEAFAD } .ace-tomorrow .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index 1118799a..a8a9111e 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -14,12 +14,7 @@ } .ace-tomorrow-night .ace_cursor { - border-left: 2px solid #AEAFAD -} - -.ace-tomorrow-night .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #AEAFAD + color: #AEAFAD } .ace-tomorrow-night .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index 51dfe2bf..dbdd4e7d 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -18,12 +18,7 @@ } .ace-tomorrow-night-blue .ace_cursor { - border-left: 2px solid #FFFFFF -} - -.ace-tomorrow-night-blue .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #FFFFFF + color: #FFFFFF } .ace-tomorrow-night-blue .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index a4c182dc..f092a44f 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -14,12 +14,7 @@ } .ace-tomorrow-night-bright .ace_cursor { - border-left: 2px solid #9F9F9F -} - -.ace-tomorrow-night-bright .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #9F9F9F + color: #9F9F9F } .ace-tomorrow-night-bright .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index fc3e532f..200044a5 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -18,12 +18,7 @@ } .ace-tomorrow-night-eighties .ace_cursor { - border-left: 2px solid #CCCCCC -} - -.ace-tomorrow-night-eighties .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #CCCCCC + color: #CCCCCC } .ace-tomorrow-night-eighties .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index 3f9d40e6..fd427a23 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -14,12 +14,7 @@ } .ace-twilight .ace_cursor { - border-left: 2px solid #A7A7A7 -} - -.ace-twilight .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #A7A7A7 + color: #A7A7A7 } .ace-twilight .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css index d0cd2582..dd1edb21 100644 --- a/lib/ace/theme/vibrant_ink.css +++ b/lib/ace/theme/vibrant_ink.css @@ -14,12 +14,7 @@ } .ace-vibrant-ink .ace_cursor { - border-left: 2px solid #FFFFFF -} - -.ace-vibrant-ink .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #FFFFFF + color: #FFFFFF } .ace-vibrant-ink .ace_marker-layer .ace_selection { diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css index 782a0837..56eb9a89 100644 --- a/lib/ace/theme/xcode.css +++ b/lib/ace/theme/xcode.css @@ -16,12 +16,7 @@ } .ace-xcode .ace_cursor { - border-left: 2px solid #000000 -} - -.ace-xcode .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid #000000 + color: #000000 } .ace-xcode .ace_marker-layer .ace_selection { diff --git a/tool/theme.tmpl.css b/tool/theme.tmpl.css index 58d16360..39bb2437 100644 --- a/tool/theme.tmpl.css +++ b/tool/theme.tmpl.css @@ -16,12 +16,7 @@ } .%cssClass% .ace_cursor { - border-left: 2px solid %cursor%; -} - -.%cssClass% .ace_overwrite-cursors .ace_cursor { - border-left: 0px; - border-bottom: 1px solid %overwrite%; + color: %cursor%; } .%cssClass% .ace_marker-layer .ace_selection { diff --git a/tool/tmtheme.js b/tool/tmtheme.js index c01fb16f..4aa4c402 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -94,7 +94,6 @@ function extractStyles(theme) { "printMargin": "#e8e8e8", "background": parseColor(globalSettings.background), "foreground": parseColor(globalSettings.foreground), - "overwrite": parseColor(globalSettings.caret), "gutter": "#e8e8e8", "selection": parseColor(globalSettings.selection), "step": "rgb(198, 219, 174)",