diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index c1825809..9c95a17b 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -190,7 +190,6 @@ url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%007%08%06%00%00%00%C4%DD%80C%00%00%03%1EiCCPICC%20Profile%00%00x%01%85T%DFk%D3P%14%FE%DAe%9D%B0%E1%8B%3Ag%11%09%3Eh%91ndStC%9C%B6kW%BA%CDZ%EA6%B7!H%9B%A6m%5C%9A%C6%24%ED~%B0%07%D9%8Bo%3A%C5w%F1%07%3E%F9%07%0C%D9%83o%7B%92%0D%C6%14a%F8%AC%88%22L%F6%22%B3%9E%9B4M'S%03%B9%F7%BB%DF%F9%EE9'%E7%E4%5E%A0%F9qZ%D3%14%2F%0F%14USO%C5%C2%FC%C4%E4%14%DF%F2%01%5E%1CC%2B%FChM%8B%86%16J%26G%40%0F%D3%B2y%EF%B3%F3%0E%1E%C6lt%EEo%DF%AB%FEc%D5%9A%95%0C%11%F0%1C%20%BE%945%C4%22%E1Y%A0i%5C%D4t%13%E0%D6%89%EF%9D15%C2%CDLsX%A7%04%09%1Fg8oc%81%E1%8C%8D%23%96f45%40%9A%09%C2%07%C5B%3AK%B8%408%98i%E0%F3%0D%D8%CE%81%14%E4'%26%A9%92.%8B%3C%ABER%2F%E5dE%B2%0C%F6%F0%1Fs%83%F2_%B0%A8%94%E9%9B%AD%E7%10%8Dm%9A%19N%D1%7C%8A%DE%1F9%7Dp%8C%E6%00%D5%C1%3F_%18%BDA%B8%9DpX6%E3%A35~B%CD%24%AE%11%26%BD%E7%EEti%98%EDe%9A%97Y)%12%25%1C%24%BCbT%AE3li%E6%0B%03%89%9A%E6%D3%ED%F4P%92%B0%9F4%BF43Y%F3%E3%EDP%95%04%EB1%C5%F5%F6KF%F4%BA%BD%D7%DB%91%93%07%E35%3E%A7)%D6%7F%40%FE%BD%F7%F5r%8A%E5y%92%F0%EB%B4%1E%8D%D5%F4%5B%92%3AV%DB%DB%E4%CD%A6%23%C3%C4wQ%3F%03HB%82%8E%1Cd(%E0%91B%0Ca%9Ac%C4%AA%F8L%16%19%22J%A4%D2itTy%B28%D6%3B(%93%96%ED%1CGx%C9_%0E%B8%5E%16%F5%5B%B2%B8%F6%E0%FB%9E%DD%25%D7%8E%BC%15%85%C5%B7%A3%D8Q%ED%B5%81%E9%BA%B2%13%9A%1B%7Fua%A5%A3n%E17%B9%E5%9B%1Bm%AB%0B%08Q%FE%8A%E5%B1H%5Ee%CAO%82Q%D7u6%E6%90S%97%FCu%0B%CF2%94%EE%25v%12X%0C%BA%AC%F0%5E%F8*l%0AO%85%17%C2%97%BF%D4%C8%CE%DE%AD%11%CB%80q%2C%3E%AB%9ES%CD%C6%EC%25%D2L%D2%EBd%B8%BF%8A%F5B%C6%18%F9%901CZ%9D%BE%24M%9C%8A9%F2%DAP%0B'%06w%82%EB%E6%E2%5C%2F%D7%07%9E%BB%CC%5D%E1%FA%B9%08%AD.r%23%8E%C2%17%F5E%7C!%F0%BE3%BE%3E_%B7o%88a%A7%DB%BE%D3d%EB%A31Z%EB%BB%D3%91%BA%A2%B1z%94%8F%DB'%F6%3D%8E%AA%13%19%B2%B1%BE%B1~V%08%2B%B4%A2cjJ%B3tO%00%03%25mN%97%F3%05%93%EF%11%84%0B%7C%88%AE-%89%8F%ABbW%90O%2B%0Ao%99%0C%5E%97%0CI%AFH%D9.%B0%3B%8F%ED%03%B6S%D6%5D%E6i_s9%F3*p%E9%1B%FD%C3%EB.7U%06%5E%19%C0%D1s.%17%A03u%E4%09%B0%7C%5E%2C%EB%15%DB%1F%3C%9E%B7%80%91%3B%DBc%AD%3Dma%BA%8B%3EV%AB%DBt.%5B%1E%01%BB%0F%AB%D5%9F%CF%AA%D5%DD%E7%E4%7F%0Bx%A3%FC%06%A9%23%0A%D6%C2%A1_2%00%00%00%09pHYs%00%00%0B%13%00%00%0B%13%01%00%9A%9C%18%00%00%00%3AIDAT8%11c%FC%FF%FF%7F%18%03%1A%60%01%F2%3F%A0%891%80%04%FF%11-%F8%17%9BJ%E2%05%B1ZD%81v%26t%E7%80%F8%A3%82h%A12%1A%20%A3%01%02%0F%01%BA%25%06%00%19%C0%0D%AEF%D5%3ES%00%00%00%00IEND%AEB%60%82"); background-repeat: no-repeat, repeat-x; background-position: center center, top left; - background-color: #4b50c3; color: transparent; border: 1px solid black; @@ -218,7 +217,7 @@ } .ace_folding-enabled .ace_gutter-cell { - padding-right: 13px!important; + padding-right: 13px; } .ace_fold-widget { diff --git a/lib/ace/editor.js b/lib/ace/editor.js index c33f4794..2d6afda6 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -648,6 +648,7 @@ var Editor = function(renderer, session) { this.$showFoldWidgets = show; this.renderer.updateFull(); }; + this.getShowFoldWidgets = function() { return this.renderer.$gutterLayer.getShowFoldWidgets(); }; diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 201da24d..8eeb7617 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-clouds .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-clouds .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-clouds .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-clouds .ace_print_margin {\ @@ -133,6 +122,8 @@ exports.cssText = "\ }\ \ .ace-clouds .ace_fold {\ + background-color: #AF956F;\ + border-color: #000000;\ }\ \ .ace-clouds .ace_support.ace_function {\ diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js index 3a47d8bb..1bef28fb 100644 --- a/lib/ace/theme/clouds_midnight.js +++ b/lib/ace/theme/clouds_midnight.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-clouds-midnight .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-clouds-midnight .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-clouds-midnight .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-clouds-midnight .ace_print_margin {\ @@ -134,6 +123,8 @@ background-color:#E92E2E;\ }\ \ .ace-clouds-midnight .ace_fold {\ + background-color: #927C5D;\ + border-color: #929292;\ }\ \ .ace-clouds-midnight .ace_support.ace_function {\ diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index 6c9bd8e7..4fdef94e 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-cobalt .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-cobalt .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-cobalt .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-cobalt .ace_print_margin {\ @@ -130,6 +119,8 @@ background-color:#800F00;\ }\ \ .ace-cobalt .ace_fold {\ + background-color: #FF9D00;\ + border-color: #FFFFFF;\ }\ \ .ace-cobalt .ace_support.ace_function {\ diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index 8495e25a..da3e0850 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-dawn .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-dawn .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-dawn .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-dawn .ace_print_margin {\ @@ -138,6 +127,8 @@ color:#B52A1D;\ }\ \ .ace-dawn .ace_fold {\ + background-color: #794938;\ + border-color: #080808;\ }\ \ .ace-dawn .ace_support.ace_function {\ diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index 48936f1c..ec52bf82 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-idle-fingers .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-idle-fingers .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-idle-fingers .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-idle-fingers .ace_print_margin {\ @@ -126,6 +115,8 @@ background-color:#FF0000;\ }\ \ .ace-idle-fingers .ace_fold {\ + background-color: #CC7833;\ + border-color: #FFFFFF;\ }\ \ .ace-idle-fingers .ace_support.ace_function {\ diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 81355f54..e1cb50c0 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-kr-theme .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-kr-theme .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-kr-theme .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-kr-theme .ace_print_margin {\ @@ -130,6 +119,8 @@ background-color:#A41300;\ }\ \ .ace-kr-theme .ace_fold {\ + background-color: #949C8B;\ + border-color: #FCFFE0;\ }\ \ .ace-kr-theme .ace_support.ace_function {\ diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js index d685631f..9ee1c221 100644 --- a/lib/ace/theme/merbivore.js +++ b/lib/ace/theme/merbivore.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-merbivore .ace_editor {\ +exports.cssClass = "ace-merbivore"; +exports.cssText = "\ +.ace-merbivore .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-merbivore .ace_editor {\ }\ \ .ace-merbivore .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-merbivore .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-merbivore .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-merbivore .ace_print_margin {\ @@ -94,13 +86,16 @@ exports.cssText = ".ace-merbivore .ace_editor {\ \ .ace-merbivore .ace_marker-layer .ace_bracket {\ margin: -1px 0 0 -1px;\ - border: 1px solid #FCE94F;\ + border: 1px solid #404040;\ }\ \ .ace-merbivore .ace_marker-layer .ace_active_line {\ background: #333435;\ }\ \ +.ace-merbivore .ace_marker-layer .ace_selected_word {\ + border: 1px solid #454545;\ +}\ \ .ace-merbivore .ace_invisible {\ color: #404040;\ @@ -110,10 +105,6 @@ exports.cssText = ".ace-merbivore .ace_editor {\ color:#FC6F09;\ }\ \ -.ace-merbivore .ace_keyword.ace_operator {\ - \ -}\ -\ .ace-merbivore .ace_constant {\ color:#1EDAFB;\ }\ @@ -135,118 +126,36 @@ exports.cssText = ".ace-merbivore .ace_editor {\ background-color:#990000;\ }\ \ -.ace-merbivore .ace_invalid.ace_illegal {\ - \ -}\ -\ -.ace-merbivore .ace_invalid.ace_deprecated {\ - color:#FFFFFF;\ - background-color:#990000;\ -}\ -\ -.ace-merbivore .ace_support {\ - \ +.ace-merbivore .ace_fold {\ + background-color: #FC6F09;\ + border-color: #E6E1DC;\ }\ \ .ace-merbivore .ace_support.ace_function {\ color:#FC6F09;\ }\ \ -.ace-merbivore .ace_function.ace_buildin {\ - \ -}\ -\ .ace-merbivore .ace_string {\ color:#8DFF0A;\ }\ \ -.ace-merbivore .ace_string.ace_regexp {\ - \ -}\ -\ .ace-merbivore .ace_comment {\ - color:#AD2EA4;\ -}\ -\ -.ace-merbivore .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-merbivore .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ -.ace-merbivore .ace_variable {\ - \ -}\ -\ -.ace-merbivore .ace_variable.ace_language {\ - \ -}\ -\ -.ace-merbivore .ace_xml_pe {\ - \ -}\ -\ -.ace-merbivore .ace_meta {\ - \ + font-style:italic;\ +color:#AD2EA4;\ }\ \ .ace-merbivore .ace_meta.ace_tag {\ color:#FC6F09;\ }\ \ -.ace-merbivore .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-merbivore .ace_entity.ace_other.ace_attribute-name {\ color:#FFFF89;\ }\ \ .ace-merbivore .ace_markup.ace_underline {\ text-decoration:underline;\ -}\ -\ -.ace-merbivore .ace_markup.ace_heading {\ - \ -}\ -\ -.ace-merbivore .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-merbivore .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-merbivore .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-merbivore .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-merbivore .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-merbivore .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-merbivore .ace_markup.ace_list {\ - \ -}\ -\ -.ace-merbivore .ace_collab.ace_user1 {\ - \ }"; -exports.cssClass = "ace-merbivore"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js index df2c0af3..56a5d58d 100644 --- a/lib/ace/theme/merbivore_soft.js +++ b/lib/ace/theme/merbivore_soft.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-merbivore-soft .ace_editor {\ +exports.cssClass = "ace-merbivore-soft"; +exports.cssText = "\ +.ace-merbivore-soft .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-merbivore-soft .ace_editor {\ }\ \ .ace-merbivore-soft .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-merbivore-soft .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-merbivore-soft .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-merbivore-soft .ace_print_margin {\ @@ -94,13 +86,16 @@ exports.cssText = ".ace-merbivore-soft .ace_editor {\ \ .ace-merbivore-soft .ace_marker-layer .ace_bracket {\ margin: -1px 0 0 -1px;\ - border: 1px solid #FCE94F;\ + border: 1px solid #404040;\ }\ \ .ace-merbivore-soft .ace_marker-layer .ace_active_line {\ background: #333435;\ }\ \ +.ace-merbivore-soft .ace_marker-layer .ace_selected_word {\ + border: 1px solid #494949;\ +}\ \ .ace-merbivore-soft .ace_invisible {\ color: #404040;\ @@ -110,10 +105,6 @@ exports.cssText = ".ace-merbivore-soft .ace_editor {\ color:#FC803A;\ }\ \ -.ace-merbivore-soft .ace_keyword.ace_operator {\ - \ -}\ -\ .ace-merbivore-soft .ace_constant {\ color:#68C1D8;\ }\ @@ -135,118 +126,42 @@ exports.cssText = ".ace-merbivore-soft .ace_editor {\ background-color:#FE3838;\ }\ \ -.ace-merbivore-soft .ace_invalid.ace_illegal {\ - \ -}\ -\ .ace-merbivore-soft .ace_invalid.ace_deprecated {\ color:#FFFFFF;\ - background-color:#FE3838;\ +background-color:#FE3838;\ }\ \ -.ace-merbivore-soft .ace_support {\ - \ -}\ -\ -.ace-merbivore-soft .ace_support.ace_function {\ - color:#FC803A;\ -}\ -\ -.ace-merbivore-soft .ace_function.ace_buildin {\ - \ +.ace-merbivore-soft .ace_fold {\ + background-color: #FC803A;\ + border-color: #E6E1DC;\ }\ \ .ace-merbivore-soft .ace_string {\ color:#8EC65F;\ }\ \ -.ace-merbivore-soft .ace_string.ace_regexp {\ - \ -}\ -\ .ace-merbivore-soft .ace_comment {\ - color:#AC4BB8;\ -}\ -\ -.ace-merbivore-soft .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-merbivore-soft .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ -.ace-merbivore-soft .ace_variable {\ - \ -}\ -\ -.ace-merbivore-soft .ace_variable.ace_language {\ - \ -}\ -\ -.ace-merbivore-soft .ace_xml_pe {\ - \ + font-style:italic;\ +color:#AC4BB8;\ }\ \ .ace-merbivore-soft .ace_meta {\ - \ + font-style:italic;\ +color:#AC4BB8;\ }\ \ .ace-merbivore-soft .ace_meta.ace_tag {\ color:#FC803A;\ }\ \ -.ace-merbivore-soft .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name {\ color:#EAF1A3;\ }\ \ .ace-merbivore-soft .ace_markup.ace_underline {\ text-decoration:underline;\ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_heading {\ - \ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-merbivore-soft .ace_markup.ace_list {\ - \ -}\ -\ -.ace-merbivore-soft .ace_collab.ace_user1 {\ - \ }"; -exports.cssClass = "ace-merbivore-soft"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 6cbce751..196c1b11 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-mono-industrial .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-mono-industrial .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-mono-industrial .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-mono-industrial .ace_print_margin {\ @@ -134,6 +123,8 @@ background-color:rgba(153, 0, 0, 0.68);\ }\ \ .ace-mono-industrial .ace_fold {\ + background-color: #A8B3AB;\ + border-color: #FFFFFF;\ }\ \ .ace-mono-industrial .ace_support.ace_function {\ diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index 3544f347..13bd9136 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-monokai .ace_editor {\ +exports.cssClass = "ace-monokai"; +exports.cssText = "\ +.ace-monokai .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-monokai .ace_editor {\ }\ \ .ace-monokai .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-monokai .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-monokai .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-monokai .ace_print_margin {\ @@ -101,6 +93,9 @@ exports.cssText = ".ace-monokai .ace_editor {\ background: #49483E;\ }\ \ +.ace-monokai .ace_marker-layer .ace_selected_word {\ + border: 1px solid #49483E;\ +}\ \ .ace-monokai .ace_invisible {\ color: #49483E;\ @@ -110,22 +105,10 @@ exports.cssText = ".ace-monokai .ace_editor {\ color:#F92672;\ }\ \ -.ace-monokai .ace_keyword.ace_operator {\ - \ -}\ -\ -.ace-monokai .ace_constant {\ - \ -}\ -\ .ace-monokai .ace_constant.ace_language {\ color:#AE81FF;\ }\ \ -.ace-monokai .ace_constant.ace_library {\ - \ -}\ -\ .ace-monokai .ace_constant.ace_numeric {\ color:#AE81FF;\ }\ @@ -135,126 +118,40 @@ exports.cssText = ".ace-monokai .ace_editor {\ background-color:#F92672;\ }\ \ -.ace-monokai .ace_invalid.ace_illegal {\ - \ -}\ -\ .ace-monokai .ace_invalid.ace_deprecated {\ color:#F8F8F0;\ background-color:#AE81FF;\ }\ \ -.ace-monokai .ace_support {\ - \ +.ace-monokai .ace_fold {\ + background-color: #A6E22E;\ + border-color: #F8F8F2;\ }\ \ .ace-monokai .ace_support.ace_function {\ color:#66D9EF;\ }\ \ -.ace-monokai .ace_function.ace_buildin {\ - \ -}\ -\ .ace-monokai .ace_string {\ color:#E6DB74;\ }\ \ -.ace-monokai .ace_string.ace_regexp {\ - \ -}\ -\ .ace-monokai .ace_comment {\ color:#75715E;\ }\ \ -.ace-monokai .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-monokai .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ -.ace-monokai .ace_variable {\ - \ -}\ -\ -.ace-monokai .ace_variable.ace_language {\ - \ -}\ -\ -.ace-monokai .ace_xml_pe {\ - \ -}\ -\ -.ace-monokai .ace_meta {\ - \ -}\ -\ -.ace-monokai .ace_meta.ace_tag {\ - \ -}\ -\ -.ace-monokai .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-monokai .ace_entity.ace_other.ace_attribute-name {\ color:#A6E22E;\ }\ \ -.ace-monokai .ace_entity.ace_name {\ - \ -}\ -\ .ace-monokai .ace_entity.ace_name.ace_function {\ color:#A6E22E;\ }\ \ .ace-monokai .ace_markup.ace_underline {\ text-decoration:underline;\ -}\ -\ -.ace-monokai .ace_markup.ace_heading {\ - \ -}\ -\ -.ace-monokai .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-monokai .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-monokai .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-monokai .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-monokai .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-monokai .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-monokai .ace_markup.ace_list {\ - \ -}\ -\ -.ace-monokai .ace_collab.ace_user1 {\ - \ }"; -exports.cssClass = "ace-monokai"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js index 6342e92e..d61464b5 100644 --- a/lib/ace/theme/pastel_on_dark.js +++ b/lib/ace/theme/pastel_on_dark.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-pastel-on-dark .ace_editor {\ +exports.cssClass = "ace-pastel-on-dark"; +exports.cssText = "\ +.ace-pastel-on-dark .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-pastel-on-dark .ace_editor {\ }\ \ .ace-pastel-on-dark .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-pastel-on-dark .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-pastel-on-dark .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-pastel-on-dark .ace_print_margin {\ @@ -67,12 +59,12 @@ exports.cssText = ".ace-pastel-on-dark .ace_editor {\ }\ \ .ace-pastel-on-dark .ace_scroller {\ - background-color: #2c2828;\ + background-color: #2C2828;\ }\ \ .ace-pastel-on-dark .ace_text-layer {\ cursor: text;\ - color: #8f938f;\ + color: #8F938F;\ }\ \ .ace-pastel-on-dark .ace_cursor {\ @@ -101,13 +93,16 @@ exports.cssText = ".ace-pastel-on-dark .ace_editor {\ background: rgba(255, 255, 255, 0.031);\ }\ \ +.ace-pastel-on-dark .ace_marker-layer .ace_selected_word {\ + border: 1px solid rgba(221, 240, 255, 0.20);\ +}\ \ .ace-pastel-on-dark .ace_invisible {\ color: rgba(255, 255, 255, 0.25);\ }\ \ .ace-pastel-on-dark .ace_keyword {\ - color:#757ad8;\ + color:#757aD8;\ }\ \ .ace-pastel-on-dark .ace_keyword.ace_operator {\ @@ -115,23 +110,20 @@ exports.cssText = ".ace-pastel-on-dark .ace_editor {\ }\ \ .ace-pastel-on-dark .ace_constant {\ - color:#4fb7c5;\ + color:#4FB7C5;\ }\ \ .ace-pastel-on-dark .ace_constant.ace_language {\ - \ -}\ -\ -.ace-pastel-on-dark .ace_constant.ace_library {\ - \ + color:#DE8E30;\ }\ \ .ace-pastel-on-dark .ace_constant.ace_numeric {\ - \ + color:#CCCCCC;\ }\ \ .ace-pastel-on-dark .ace_invalid {\ - \ + color:#F8F8F8;\ +background-color:rgba(86, 45, 86, 0.75);\ }\ \ .ace-pastel-on-dark .ace_invalid.ace_illegal {\ @@ -145,20 +137,17 @@ font-style:italic;\ color:#D2A8A1;\ }\ \ -.ace-pastel-on-dark .ace_support {\ - color:#9a9a9a;\ +.ace-pastel-on-dark .ace_fold {\ + background-color: #757aD8;\ + border-color: #8F938F;\ }\ \ .ace-pastel-on-dark .ace_support.ace_function {\ - color:#aeb2f8;\ -}\ -\ -.ace-pastel-on-dark .ace_function.ace_buildin {\ - \ + color:#AEB2F8;\ }\ \ .ace-pastel-on-dark .ace_string {\ - color:#66a968;\ + color:#66A968;\ }\ \ .ace-pastel-on-dark .ace_string.ace_regexp {\ @@ -166,36 +155,25 @@ color:#D2A8A1;\ }\ \ .ace-pastel-on-dark .ace_comment {\ - color:#656865;\ -}\ -\ -.ace-pastel-on-dark .ace_comment.ace_doc {\ - color:A6C6FF;\ -}\ -\ -.ace-pastel-on-dark .ace_comment.ace_doc.ace_tag {\ - color:A6C6FF;\ + color:#A6C6FF;\ }\ \ .ace-pastel-on-dark .ace_variable {\ - color:#bebf55;\ + color:#BEBF55;\ }\ \ .ace-pastel-on-dark .ace_variable.ace_language {\ - color:#bebf55;\ -}\ -\ -.ace-pastel-on-dark .ace_markup.ace_underline {\ - text-decoration:underline;\ + color:#C1C144;\ }\ \ .ace-pastel-on-dark .ace_xml_pe {\ color:#494949;\ +}\ +\ +.ace-pastel-on-dark .ace_markup.ace_underline {\ + text-decoration:underline;\ }"; -exports.cssClass = "ace-pastel-on-dark"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js index 448d8236..e5b950c3 100644 --- a/lib/ace/theme/solarized_dark.js +++ b/lib/ace/theme/solarized_dark.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-solarized-dark .ace_editor {\ +exports.cssClass = "ace-solarized-dark"; +exports.cssText = "\ +.ace-solarized-dark .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-solarized-dark .ace_editor {\ }\ \ .ace-solarized-dark .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-solarized-dark .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-solarized-dark .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-solarized-dark .ace_print_margin {\ @@ -101,6 +93,9 @@ exports.cssText = ".ace-solarized-dark .ace_editor {\ background: #073642;\ }\ \ +.ace-solarized-dark .ace_marker-layer .ace_selected_word {\ + border: 1px solid #073642;\ +}\ \ .ace-solarized-dark .ace_invisible {\ color: rgba(147, 161, 161, 0.50);\ @@ -110,50 +105,23 @@ exports.cssText = ".ace-solarized-dark .ace_editor {\ color:#859900;\ }\ \ -.ace-solarized-dark .ace_keyword.ace_operator {\ - \ -}\ -\ -.ace-solarized-dark .ace_constant {\ - \ -}\ -\ .ace-solarized-dark .ace_constant.ace_language {\ color:#B58900;\ }\ \ -.ace-solarized-dark .ace_constant.ace_library {\ - \ -}\ -\ .ace-solarized-dark .ace_constant.ace_numeric {\ color:#D33682;\ }\ \ -.ace-solarized-dark .ace_invalid {\ - \ -}\ -\ -.ace-solarized-dark .ace_invalid.ace_illegal {\ - \ -}\ -\ -.ace-solarized-dark .ace_invalid.ace_deprecated {\ - \ -}\ -\ -.ace-solarized-dark .ace_support {\ - \ +.ace-solarized-dark .ace_fold {\ + background-color: #268BD2;\ + border-color: #93A1A1;\ }\ \ .ace-solarized-dark .ace_support.ace_function {\ color:#268BD2;\ }\ \ -.ace-solarized-dark .ace_function.ace_buildin {\ - \ -}\ -\ .ace-solarized-dark .ace_string {\ color:#2AA198;\ }\ @@ -167,93 +135,22 @@ exports.cssText = ".ace-solarized-dark .ace_editor {\ color:#657B83;\ }\ \ -.ace-solarized-dark .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-solarized-dark .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ -.ace-solarized-dark .ace_variable {\ - \ -}\ -\ .ace-solarized-dark .ace_variable.ace_language {\ color:#268BD2;\ }\ \ -.ace-solarized-dark .ace_xml_pe {\ - \ -}\ -\ -.ace-solarized-dark .ace_meta {\ - \ -}\ -\ -.ace-solarized-dark .ace_meta.ace_tag {\ - \ -}\ -\ -.ace-solarized-dark .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-solarized-dark .ace_entity.ace_other.ace_attribute-name {\ color:#93A1A1;\ }\ \ -.ace-solarized-dark .ace_entity.ace_name {\ - \ -}\ -\ .ace-solarized-dark .ace_entity.ace_name.ace_function {\ color:#268BD2;\ }\ \ .ace-solarized-dark .ace_markup.ace_underline {\ text-decoration:underline;\ -}\ -\ -.ace-solarized-dark .ace_markup.ace_heading {\ - \ -}\ -\ -.ace-solarized-dark .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-solarized-dark .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-solarized-dark .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-solarized-dark .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-solarized-dark .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-solarized-dark .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-solarized-dark .ace_markup.ace_list {\ - \ -}\ -\ -.ace-solarized-dark .ace_collab.ace_user1 {\ - \ }"; -exports.cssClass = "ace-solarized-dark"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js index d412667e..dba5e522 100644 --- a/lib/ace/theme/solarized_light.js +++ b/lib/ace/theme/solarized_light.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = false; -exports.cssText = ".ace-solarized-light .ace_editor {\ +exports.cssClass = "ace-solarized-light"; +exports.cssText = "\ +.ace-solarized-light .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-solarized-light .ace_editor {\ }\ \ .ace-solarized-light .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-solarized-light .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-solarized-light .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-solarized-light .ace_print_margin {\ @@ -101,6 +93,9 @@ exports.cssText = ".ace-solarized-light .ace_editor {\ background: #EEE8D5;\ }\ \ +.ace-solarized-light .ace_marker-layer .ace_selected_word {\ + border: 1px solid #073642;\ +}\ \ .ace-solarized-light .ace_invisible {\ color: rgba(147, 161, 161, 0.50);\ @@ -110,50 +105,23 @@ exports.cssText = ".ace-solarized-light .ace_editor {\ color:#859900;\ }\ \ -.ace-solarized-light .ace_keyword.ace_operator {\ - \ -}\ -\ -.ace-solarized-light .ace_constant {\ - \ -}\ -\ .ace-solarized-light .ace_constant.ace_language {\ color:#B58900;\ }\ \ -.ace-solarized-light .ace_constant.ace_library {\ - \ -}\ -\ .ace-solarized-light .ace_constant.ace_numeric {\ color:#D33682;\ }\ \ -.ace-solarized-light .ace_invalid {\ - \ -}\ -\ -.ace-solarized-light .ace_invalid.ace_illegal {\ - \ -}\ -\ -.ace-solarized-light .ace_invalid.ace_deprecated {\ - \ -}\ -\ -.ace-solarized-light .ace_support {\ - \ +.ace-solarized-light .ace_fold {\ + background-color: #268BD2;\ + border-color: #586E75;\ }\ \ .ace-solarized-light .ace_support.ace_function {\ color:#268BD2;\ }\ \ -.ace-solarized-light .ace_function.ace_buildin {\ - \ -}\ -\ .ace-solarized-light .ace_string {\ color:#2AA198;\ }\ @@ -166,93 +134,22 @@ exports.cssText = ".ace-solarized-light .ace_editor {\ color:#93A1A1;\ }\ \ -.ace-solarized-light .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-solarized-light .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ -.ace-solarized-light .ace_variable {\ - \ -}\ -\ .ace-solarized-light .ace_variable.ace_language {\ color:#268BD2;\ }\ \ -.ace-solarized-light .ace_xml_pe {\ - \ -}\ -\ -.ace-solarized-light .ace_meta {\ - \ -}\ -\ -.ace-solarized-light .ace_meta.ace_tag {\ - \ -}\ -\ -.ace-solarized-light .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-solarized-light .ace_entity.ace_other.ace_attribute-name {\ color:#93A1A1;\ }\ \ -.ace-solarized-light .ace_entity.ace_name {\ - \ -}\ -\ .ace-solarized-light .ace_entity.ace_name.ace_function {\ color:#268BD2;\ }\ \ .ace-solarized-light .ace_markup.ace_underline {\ text-decoration:underline;\ -}\ -\ -.ace-solarized-light .ace_markup.ace_heading {\ - \ -}\ -\ -.ace-solarized-light .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-solarized-light .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-solarized-light .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-solarized-light .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-solarized-light .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-solarized-light .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-solarized-light .ace_markup.ace_list {\ - \ -}\ -\ -.ace-solarized-light .ace_collab.ace_user1 {\ - \ }"; -exports.cssClass = "ace-solarized-light"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index bbd40346..3e7a5ef0 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -47,25 +47,17 @@ exports.cssText = ".ace-tm .ace_editor {\ }\ \ .ace-tm .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-tm .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-tm .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-tm .ace_print_margin {\ width: 1px;\ background: #e8e8e8;\ }\ +.ace-tm .ace_fold {\ + background-color: #0000A2;\ +}\ \ .ace-tm .ace_text-layer {\ cursor: text;\ diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js index 680962e8..9f49f92b 100644 --- a/lib/ace/theme/tomorrow.js +++ b/lib/ace/theme/tomorrow.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = false; -exports.cssText = ".ace-tomorrow .ace_editor {\ +exports.cssClass = "ace-tomorrow"; +exports.cssText = "\ +.ace-tomorrow .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-tomorrow .ace_editor {\ }\ \ .ace-tomorrow .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-tomorrow .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-tomorrow .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-tomorrow .ace_print_margin {\ @@ -101,6 +93,9 @@ exports.cssText = ".ace-tomorrow .ace_editor {\ background: #EFEFEF;\ }\ \ +.ace-tomorrow .ace_marker-layer .ace_selected_word {\ + border: 1px solid #D6D6D6;\ +}\ \ .ace-tomorrow .ace_invisible {\ color: #D1D1D1;\ @@ -114,18 +109,10 @@ exports.cssText = ".ace-tomorrow .ace_editor {\ color:#3E999F;\ }\ \ -.ace-tomorrow .ace_constant {\ - \ -}\ -\ .ace-tomorrow .ace_constant.ace_language {\ color:#F5871F;\ }\ \ -.ace-tomorrow .ace_constant.ace_library {\ - \ -}\ -\ .ace-tomorrow .ace_constant.ace_numeric {\ color:#F5871F;\ }\ @@ -135,27 +122,20 @@ exports.cssText = ".ace-tomorrow .ace_editor {\ background-color:#C82829;\ }\ \ -.ace-tomorrow .ace_invalid.ace_illegal {\ - \ -}\ -\ .ace-tomorrow .ace_invalid.ace_deprecated {\ color:#FFFFFF;\ background-color:#8959A8;\ }\ \ -.ace-tomorrow .ace_support {\ - \ +.ace-tomorrow .ace_fold {\ + background-color: #4271AE;\ + border-color: #4D4D4C;\ }\ \ .ace-tomorrow .ace_support.ace_function {\ color:#4271AE;\ }\ \ -.ace-tomorrow .ace_function.ace_buildin {\ - \ -}\ -\ .ace-tomorrow .ace_string {\ color:#718C00;\ }\ @@ -168,46 +148,18 @@ background-color:#8959A8;\ color:#8E908C;\ }\ \ -.ace-tomorrow .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-tomorrow .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ .ace-tomorrow .ace_variable {\ color:#C82829;\ }\ \ -.ace-tomorrow .ace_variable.ace_language {\ - \ -}\ -\ -.ace-tomorrow .ace_xml_pe {\ - \ -}\ -\ -.ace-tomorrow .ace_meta {\ - \ -}\ -\ .ace-tomorrow .ace_meta.ace_tag {\ color:#C82829;\ }\ \ -.ace-tomorrow .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-tomorrow .ace_entity.ace_other.ace_attribute-name {\ color:#C82829;\ }\ \ -.ace-tomorrow .ace_entity.ace_name {\ - \ -}\ -\ .ace-tomorrow .ace_entity.ace_name.ace_function {\ color:#4271AE;\ }\ @@ -218,42 +170,8 @@ background-color:#8959A8;\ \ .ace-tomorrow .ace_markup.ace_heading {\ color:#718C00;\ -}\ -\ -.ace-tomorrow .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-tomorrow .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-tomorrow .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-tomorrow .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-tomorrow .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-tomorrow .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-tomorrow .ace_markup.ace_list {\ - \ -}\ -\ -.ace-tomorrow .ace_collab.ace_user1 {\ - \ }"; - exports.cssClass = "ace-tomorrow"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); -}); \ No newline at end of file +}); diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js index 16ca1c3d..5be20505 100644 --- a/lib/ace/theme/tomorrow_night.js +++ b/lib/ace/theme/tomorrow_night.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-tomorrow-night .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-tomorrow-night .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-tomorrow-night .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-tomorrow-night .ace_print_margin {\ @@ -139,6 +128,8 @@ background-color:#B798BF;\ }\ \ .ace-tomorrow-night .ace_fold {\ + background-color: #81A2BE;\ + border-color: #C5C8C6;\ }\ \ .ace-tomorrow-night .ace_support.ace_function {\ diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js index 0e1b4f7b..015f6da8 100644 --- a/lib/ace/theme/tomorrow_night_blue.js +++ b/lib/ace/theme/tomorrow_night_blue.js @@ -49,19 +49,8 @@ exports.cssText = "\ }\ \ .ace-tomorrow-night-blue .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-tomorrow-night-blue .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-tomorrow-night-blue .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-tomorrow-night-blue .ace_print_margin {\ @@ -139,6 +128,8 @@ background-color:#EBBBFF;\ }\ \ .ace-tomorrow-night-blue .ace_fold {\ + background-color: #BBDAFF;\ + border-color: #FFFFFF;\ }\ \ .ace-tomorrow-night-blue .ace_support.ace_function {\ diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js index c126fafe..7a677655 100644 --- a/lib/ace/theme/tomorrow_night_bright.js +++ b/lib/ace/theme/tomorrow_night_bright.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-tomorrow-night-bright .ace_editor {\ +exports.cssClass = "ace-tomorrow-night-bright"; +exports.cssText = "\ +.ace-tomorrow-night-bright .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-tomorrow-night-bright .ace_editor {\ }\ \ .ace-tomorrow-night-bright .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-tomorrow-night-bright .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-tomorrow-night-bright .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-tomorrow-night-bright .ace_print_margin {\ @@ -101,6 +93,9 @@ exports.cssText = ".ace-tomorrow-night-bright .ace_editor {\ background: #2A2A2A;\ }\ \ +.ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word {\ + border: 1px solid #424242;\ +}\ \ .ace-tomorrow-night-bright .ace_invisible {\ color: #343434;\ @@ -114,18 +109,10 @@ exports.cssText = ".ace-tomorrow-night-bright .ace_editor {\ color:#70C0B1;\ }\ \ -.ace-tomorrow-night-bright .ace_constant {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_constant.ace_language {\ color:#E78C45;\ }\ \ -.ace-tomorrow-night-bright .ace_constant.ace_library {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_constant.ace_numeric {\ color:#E78C45;\ }\ @@ -135,27 +122,20 @@ exports.cssText = ".ace-tomorrow-night-bright .ace_editor {\ background-color:#DF5F5F;\ }\ \ -.ace-tomorrow-night-bright .ace_invalid.ace_illegal {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_invalid.ace_deprecated {\ color:#CED2CF;\ background-color:#B798BF;\ }\ \ -.ace-tomorrow-night-bright .ace_support {\ - \ +.ace-tomorrow-night-bright .ace_fold {\ + background-color: #7AA6DA;\ + border-color: #DEDEDE;\ }\ \ .ace-tomorrow-night-bright .ace_support.ace_function {\ color:#7AA6DA;\ }\ \ -.ace-tomorrow-night-bright .ace_function.ace_buildin {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_string {\ color:#B9CA4A;\ }\ @@ -168,46 +148,18 @@ background-color:#B798BF;\ color:#969896;\ }\ \ -.ace-tomorrow-night-bright .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_variable {\ color:#D54E53;\ }\ \ -.ace-tomorrow-night-bright .ace_variable.ace_language {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_xml_pe {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_meta {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_meta.ace_tag {\ color:#D54E53;\ }\ \ -.ace-tomorrow-night-bright .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name {\ color:#D54E53;\ }\ \ -.ace-tomorrow-night-bright .ace_entity.ace_name {\ - \ -}\ -\ .ace-tomorrow-night-bright .ace_entity.ace_name.ace_function {\ color:#7AA6DA;\ }\ @@ -218,43 +170,8 @@ background-color:#B798BF;\ \ .ace-tomorrow-night-bright .ace_markup.ace_heading {\ color:#B9CA4A;\ -}\ -\ -.ace-tomorrow-night-bright .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_markup.ace_list {\ - \ -}\ -\ -.ace-tomorrow-night-bright .ace_collab.ace_user1 {\ - \ }"; - exports.cssClass = "ace-tomorrow-night-bright"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - -}); \ No newline at end of file +}); diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js index 4ff09b12..01a149f5 100644 --- a/lib/ace/theme/tomorrow_night_eighties.js +++ b/lib/ace/theme/tomorrow_night_eighties.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-tomorrow-night-eighties .ace_editor {\ +exports.cssClass = "ace-tomorrow-night-eighties"; +exports.cssText = "\ +.ace-tomorrow-night-eighties .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-tomorrow-night-eighties .ace_editor {\ }\ \ .ace-tomorrow-night-eighties .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-tomorrow-night-eighties .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-tomorrow-night-eighties .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-tomorrow-night-eighties .ace_print_margin {\ @@ -101,6 +93,9 @@ exports.cssText = ".ace-tomorrow-night-eighties .ace_editor {\ background: #393939;\ }\ \ +.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word {\ + border: 1px solid #515151;\ +}\ \ .ace-tomorrow-night-eighties .ace_invisible {\ color: #6A6A6A;\ @@ -114,18 +109,10 @@ exports.cssText = ".ace-tomorrow-night-eighties .ace_editor {\ color:#66CCCC;\ }\ \ -.ace-tomorrow-night-eighties .ace_constant {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_constant.ace_language {\ color:#F99157;\ }\ \ -.ace-tomorrow-night-eighties .ace_constant.ace_library {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_constant.ace_numeric {\ color:#F99157;\ }\ @@ -135,79 +122,40 @@ exports.cssText = ".ace-tomorrow-night-eighties .ace_editor {\ background-color:#F2777A;\ }\ \ -.ace-tomorrow-night-eighties .ace_invalid.ace_illegal {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_invalid.ace_deprecated {\ color:#CDCDCD;\ background-color:#CC99CC;\ }\ \ -.ace-tomorrow-night-eighties .ace_support {\ - \ +.ace-tomorrow-night-eighties .ace_fold {\ + background-color: #6699CC;\ + border-color: #CCCCCC;\ }\ \ .ace-tomorrow-night-eighties .ace_support.ace_function {\ color:#6699CC;\ }\ \ -.ace-tomorrow-night-eighties .ace_function.ace_buildin {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_string {\ color:#99CC99;\ }\ \ -.ace-tomorrow-night-eighties .ace_string.ace_regexp {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_comment {\ color:#999999;\ }\ \ -.ace-tomorrow-night-eighties .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_variable {\ color:#F2777A;\ }\ \ -.ace-tomorrow-night-eighties .ace_variable.ace_language {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_xml_pe {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_meta {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_meta.ace_tag {\ color:#F2777A;\ }\ \ -.ace-tomorrow-night-eighties .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name {\ color:#F2777A;\ }\ \ -.ace-tomorrow-night-eighties .ace_entity.ace_name {\ - \ -}\ -\ .ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function {\ color:#6699CC;\ }\ @@ -218,42 +166,8 @@ background-color:#CC99CC;\ \ .ace-tomorrow-night-eighties .ace_markup.ace_heading {\ color:#99CC99;\ -}\ -\ -.ace-tomorrow-night-eighties .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_markup.ace_list {\ - \ -}\ -\ -.ace-tomorrow-night-eighties .ace_collab.ace_user1 {\ - \ }"; - exports.cssClass = "ace-tomorrow-night-eighties"; - var dom = require("../lib/dom"); - dom.importCssString(exports.cssText); -}); \ No newline at end of file + dom.importCssString(exports.cssText); +}); diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 710a1c1b..5b22e828 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -36,9 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; exports.cssClass = "ace-twilight"; -exports.cssText = ".ace-twilight .ace_editor {\ +exports.cssText = "\ +.ace-twilight .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -47,19 +49,8 @@ exports.cssText = ".ace-twilight .ace_editor {\ }\ \ .ace-twilight .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-twilight .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-twilight .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-twilight .ace_print_margin {\ @@ -102,6 +93,9 @@ exports.cssText = ".ace-twilight .ace_editor {\ background: rgba(255, 255, 255, 0.031);\ }\ \ +.ace-twilight .ace_marker-layer .ace_selected_word {\ + border: 1px solid rgba(221, 240, 255, 0.20);\ +}\ \ .ace-twilight .ace_invisible {\ color: rgba(255, 255, 255, 0.25);\ @@ -111,30 +105,10 @@ exports.cssText = ".ace-twilight .ace_editor {\ color:#CDA869;\ }\ \ -.ace-twilight .ace_keyword.ace_operator {\ - \ -}\ -\ .ace-twilight .ace_constant {\ color:#CF6A4C;\ }\ \ -.ace-twilight .ace_constant.ace_language {\ - \ -}\ -\ -.ace-twilight .ace_constant.ace_library {\ - \ -}\ -\ -.ace-twilight .ace_constant.ace_numeric {\ - \ -}\ -\ -.ace-twilight .ace_invalid {\ - \ -}\ -\ .ace-twilight .ace_invalid.ace_illegal {\ color:#F8F8F8;\ background-color:rgba(86, 45, 86, 0.75);\ @@ -150,12 +124,13 @@ color:#D2A8A1;\ color:#9B859D;\ }\ \ -.ace-twilight .ace_support.ace_function {\ - color:#DAD085;\ +.ace-twilight .ace_fold {\ + background-color: #AC885B;\ + border-color: #F8F8F8;\ }\ \ -.ace-twilight .ace_function.ace_buildin {\ - \ +.ace-twilight .ace_support.ace_function {\ + color:#DAD085;\ }\ \ .ace-twilight .ace_string {\ @@ -171,46 +146,18 @@ color:#D2A8A1;\ color:#5F5A60;\ }\ \ -.ace-twilight .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-twilight .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ .ace-twilight .ace_variable {\ color:#7587A6;\ }\ \ -.ace-twilight .ace_variable.ace_language {\ - \ -}\ -\ .ace-twilight .ace_xml_pe {\ color:#494949;\ }\ \ -.ace-twilight .ace_meta {\ - \ -}\ -\ .ace-twilight .ace_meta.ace_tag {\ color:#AC885B;\ }\ \ -.ace-twilight .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ -.ace-twilight .ace_entity.ace_other.ace_attribute-name {\ - \ -}\ -\ -.ace-twilight .ace_entity.ace_name {\ - \ -}\ -\ .ace-twilight .ace_entity.ace_name.ace_function {\ color:#AC885B;\ }\ @@ -223,39 +170,10 @@ color:#5F5A60;\ color:#CF6A4C;\ }\ \ -.ace-twilight .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-twilight .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-twilight .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-twilight .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-twilight .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-twilight .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ .ace-twilight .ace_markup.ace_list {\ color:#F9EE98;\ -}\ -\ -.ace-twilight .ace_collab.ace_user1 {\ - \ }"; var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js index cda85375..738d0590 100644 --- a/lib/ace/theme/vibrant_ink.js +++ b/lib/ace/theme/vibrant_ink.js @@ -36,8 +36,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { + exports.isDark = true; -exports.cssText = ".ace-vibrant-ink .ace_editor {\ +exports.cssClass = "ace-vibrant-ink"; +exports.cssText = "\ +.ace-vibrant-ink .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ }\ \ @@ -46,19 +49,8 @@ exports.cssText = ".ace-vibrant-ink .ace_editor {\ }\ \ .ace-vibrant-ink .ace_gutter {\ - width: 50px;\ background: #e8e8e8;\ color: #333;\ - overflow : hidden;\ -}\ -\ -.ace-vibrant-ink .ace_gutter-layer {\ - width: 100%;\ - text-align: right;\ -}\ -\ -.ace-vibrant-ink .ace_gutter-layer .ace_gutter-cell {\ - padding-right: 6px;\ }\ \ .ace-vibrant-ink .ace_print_margin {\ @@ -94,13 +86,16 @@ exports.cssText = ".ace-vibrant-ink .ace_editor {\ \ .ace-vibrant-ink .ace_marker-layer .ace_bracket {\ margin: -1px 0 0 -1px;\ - border: 1px solid #99CC99;\ + border: 1px solid #404040;\ }\ \ .ace-vibrant-ink .ace_marker-layer .ace_active_line {\ background: #333333;\ }\ \ +.ace-vibrant-ink .ace_marker-layer .ace_selected_word {\ + border: 1px solid #6699CC;\ +}\ \ .ace-vibrant-ink .ace_invisible {\ color: #404040;\ @@ -110,52 +105,33 @@ exports.cssText = ".ace-vibrant-ink .ace_editor {\ color:#FF6600;\ }\ \ -.ace-vibrant-ink .ace_keyword.ace_operator {\ - \ -}\ -\ .ace-vibrant-ink .ace_constant {\ - \ -}\ -\ -.ace-vibrant-ink .ace_constant.ace_language {\ color:#339999;\ }\ \ -.ace-vibrant-ink .ace_constant.ace_library {\ - \ -}\ -\ .ace-vibrant-ink .ace_constant.ace_numeric {\ color:#99CC99;\ }\ \ .ace-vibrant-ink .ace_invalid {\ color:#CCFF33;\ - background-color:#000000;\ -}\ -\ -.ace-vibrant-ink .ace_invalid.ace_illegal {\ - \ +background-color:#000000;\ }\ \ .ace-vibrant-ink .ace_invalid.ace_deprecated {\ color:#CCFF33;\ - background-color:#000000;\ +background-color:#000000;\ }\ \ -.ace-vibrant-ink .ace_support {\ - \ +.ace-vibrant-ink .ace_fold {\ + background-color: #FFCC00;\ + border-color: #FFFFFF;\ }\ \ .ace-vibrant-ink .ace_support.ace_function {\ color:#FFCC00;\ }\ \ -.ace-vibrant-ink .ace_function.ace_buildin {\ - \ -}\ -\ .ace-vibrant-ink .ace_string {\ color:#66FF00;\ }\ @@ -168,94 +144,19 @@ exports.cssText = ".ace-vibrant-ink .ace_editor {\ color:#9933CC;\ }\ \ -.ace-vibrant-ink .ace_comment.ace_doc {\ - \ -}\ -\ -.ace-vibrant-ink .ace_comment.ace_doc.ace_tag {\ - \ -}\ -\ -.ace-vibrant-ink .ace_variable {\ - \ -}\ -\ -.ace-vibrant-ink .ace_variable.ace_language {\ - \ -}\ -\ -.ace-vibrant-ink .ace_xml_pe {\ - \ -}\ -\ -.ace-vibrant-ink .ace_meta {\ - \ -}\ -\ -.ace-vibrant-ink .ace_meta.ace_tag {\ - \ -}\ -\ -.ace-vibrant-ink .ace_meta.ace_tag.ace_input {\ - \ -}\ -\ .ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name {\ font-style:italic;\ color:#99CC99;\ }\ \ -.ace-vibrant-ink .ace_entity.ace_name {\ - \ -}\ -\ .ace-vibrant-ink .ace_entity.ace_name.ace_function {\ color:#FFCC00;\ }\ \ .ace-vibrant-ink .ace_markup.ace_underline {\ text-decoration:underline;\ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_heading {\ - \ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_heading.ace_1 {\ - \ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_heading.ace_2 {\ - \ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_heading.ace_3 {\ - \ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_heading.ace_4 {\ - \ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_heading.ace_5 {\ - \ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_heading.ace_6 {\ - \ -}\ -\ -.ace-vibrant-ink .ace_markup.ace_list {\ - \ -}\ -\ -.ace-vibrant-ink .ace_collab.ace_user1 {\ - \ }"; -exports.cssClass = "ace-vibrant-ink"; - var dom = require("../lib/dom"); dom.importCssString(exports.cssText); - }); diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 34e8cbf3..99af91b7 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -101,7 +101,8 @@ } .%cssClass% .ace_fold { - outline-color: %foldOutline% + background-color: %fold%; + border-color: %foreground%; } .%cssClass% .ace_support.ace_function { diff --git a/tool/tmtheme.js b/tool/tmtheme.js index 8bd43221..501aba68 100644 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -119,7 +119,7 @@ function extractStyles(theme) { "cursor": parseColor(globalSettings.caret), "invisible": "color: " + parseColor(globalSettings.invisibles) + ";" - } + }; for (var i=1; ilineHighlight #333435 selection - #392243E0 + #494949 @@ -44,6 +44,19 @@ #AC4BB8 + + name + Deprecated + scope + invalid.deprecated + settings + + foreground + #FFFFFF + background + #FE3838 + + name Keyword @@ -169,6 +182,17 @@ + + name + Library constant + scope + constant.library + settings + + foreground + #8EC65F + + name Library type @@ -204,6 +228,19 @@ #FC803A + + name + Markup tag + scope + meta + settings + + fontStyle + italic + foreground + #AC4BB8 + + name Markup tag attribute diff --git a/tool/tmthemes/Merbivore.tmTheme b/tool/tmthemes/Merbivore.tmTheme index ce8e56e3..41afeb81 100644 --- a/tool/tmthemes/Merbivore.tmTheme +++ b/tool/tmthemes/Merbivore.tmTheme @@ -20,7 +20,7 @@ lineHighlight #333435 selection - #5A647EE0 + #454545 @@ -132,6 +132,28 @@ settings + + name + Constant lib + scope + constant.library + settings + + foreground + #8DFF0A + + + + name + support function + scope + support.function + settings + + foreground + #FC6F09 + + name Constant (built-in) @@ -158,17 +180,6 @@ #8DFF0A - - name - Library function - scope - support.function - settings - - fontStyle - - - name Library type diff --git a/tool/tmthemes/Pastels on Dark.tmTheme b/tool/tmthemes/Pastels on Dark.tmTheme index e3928606..47b83631 100644 --- a/tool/tmthemes/Pastels on Dark.tmTheme +++ b/tool/tmthemes/Pastels on Dark.tmTheme @@ -12,17 +12,17 @@ settings background - #211E1E + #2C2828 caret - #FFFFFF + #A7A7A7 foreground - #DADADA + #8F938F invisibles - #4F4D4D + #FFFFFF40 lineHighlight - #353030 + #FFFFFF08 selection - #73597E80 + #DDF0FF33 @@ -35,7 +35,7 @@ fontStyle foreground - #555555 + #A6C6FF @@ -48,7 +48,7 @@ fontStyle foreground - #555555 + #A6C6FF @@ -59,7 +59,7 @@ settings foreground - #AD9361 + #66A968 @@ -85,7 +85,7 @@ fontStyle foreground - #A1A1FF + #757aD8 @@ -122,7 +122,7 @@ fontStyle foreground - #A1A1FF + #AEB2F8 @@ -206,15 +206,28 @@ name Invalid scope - invalid + invalid, invalid.illegal settings background - #FF0000 + #562D56BF fontStyle bold foreground - #FFF9F9 + #F8F8F8 + + + + name + Invalid + scope + invalid.deprecated + settings + + fontStyle + italic, underline + foreground + #D2A8A1 @@ -224,6 +237,8 @@ invalid.deprecated.trailing-whitespace settings + fontStyle + bold background #FFD0D0 @@ -260,7 +275,7 @@ fontStyle foreground - #666666 + #E9C062 @@ -269,6 +284,17 @@ scope variable settings + + foreground + #BEBF55 + + + + name + Variables + scope + variable.language + settings foreground #C1C144 @@ -282,7 +308,7 @@ settings foreground - #6782D3 + #4FB7C5 @@ -384,7 +410,7 @@ fontStyle foreground - #47B8D6 + #797878 @@ -419,7 +445,7 @@ settings foreground - #888888 + #494949 diff --git a/tool/tmthemes/Vibrant Ink.tmTheme b/tool/tmthemes/Vibrant Ink.tmTheme index 67d774a6..a1e5cf28 100644 --- a/tool/tmthemes/Vibrant Ink.tmTheme +++ b/tool/tmthemes/Vibrant Ink.tmTheme @@ -10,7 +10,7 @@ settings background - #000000 + #0F0F0F caret #FFFFFF foreground @@ -18,9 +18,9 @@ invisibles #404040 lineHighlight - #333300 + #333333 selection - #35493CE0 + #6699CC @@ -62,13 +62,26 @@ name - Ruby Number + Invalid scope - constant.numeric.ruby + invalid, invalid.deprecated + settings + + background + #000000 + foreground + #CCFF33 + + + + name + Number + scope + constant.numeric settings foreground - #CCFF33 + #99CC99 @@ -205,13 +218,13 @@ name - ActiveRecord Function + Support Function scope - support.function.activerecord.rails + support.function settings foreground - #999966 + #FFCC00