diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css
index 22df0460..16568fc3 100644
--- a/lib/ace/theme/cobalt.css
+++ b/lib/ace/theme/cobalt.css
@@ -1,6 +1,6 @@
.ace-cobalt .ace_gutter {
background: #011e3a;
- color: #fff
+ color: rgb(128,145,160)
}
.ace-cobalt .ace_print-margin {
diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css
index 91318b30..f507ec10 100644
--- a/lib/ace/theme/idle_fingers.css
+++ b/lib/ace/theme/idle_fingers.css
@@ -1,6 +1,6 @@
.ace-idle-fingers .ace_gutter {
background: #3b3b3b;
- color: #fff
+ color: rgb(153,153,153)
}
.ace-idle-fingers .ace_print-margin {
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
index 183e0eaf..5c896fb9 100644
--- a/lib/ace/theme/tomorrow_night_bright.css
+++ b/lib/ace/theme/tomorrow_night_bright.css
@@ -34,12 +34,13 @@
margin: -1px 0 0 -1px;
border: 1px solid #888888
}
+
.ace-tomorrow-night-bright .ace_marker-layer .ace_highlight {
- border: 1px solid rgb(110, 119, 0);
- border-bottom: 0;
- box-shadow: inset 0 -1px rgb(110, 119, 0);
- margin: -1px 0 0 -1px;
- background: rgba(255, 235, 0, 0.1);
+ border: 1px solid rgb(110, 119, 0);
+ border-bottom: 0;
+ box-shadow: inset 0 -1px rgb(110, 119, 0);
+ margin: -1px 0 0 -1px;
+ background: rgba(255, 235, 0, 0.1)
}
.ace-tomorrow-night-bright .ace_marker-layer .ace_active-line {
@@ -132,7 +133,7 @@
}
.ace-tomorrow-night-bright .ace_c9searchresults.ace_keyword {
- color: #C2C280;
+ color: #C2C280
}
.ace-tomorrow-night-bright .ace_indent-guide {
diff --git a/tool/templates/theme.css b/tool/templates/theme.css
index 39bb2437..8515d0c3 100644
--- a/tool/templates/theme.css
+++ b/tool/templates/theme.css
@@ -1,8 +1,8 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: %uuid%) */
.%cssClass% .ace_gutter {
- background: #e8e8e8;
- color: #333;
+ background: %gutterBg%;
+ color: %gutterFg%;
}
.%cssClass% .ace_print-margin {
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index e9e34f39..02d9542e 100755
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -115,7 +115,7 @@ function extractStyles(theme) {
var aceScope = supportedScopes[scope];
if (aceScope) {
- colors[aceScope] = style;
+ colors[aceScope] = style;
}
else if (style) {
unsupportedScopes[scope] = (unsupportedScopes[scope] || 0) + 1;
@@ -134,25 +134,44 @@ function extractStyles(theme) {
colors.fold = foldSource.match(/\:([^;]+)/)[1];
}
}
+
+ colors.gutterBg = colors.background
+ colors.gutterFg = mix(colors.foreground, colors.background, 0.5)
if (!colors.selected_word_highlight)
colors.selected_word_highlight = "border: 1px solid " + colors.selection + ";";
colors.isDark = (luma(colors.background) < 0.5) + "";
-
+
return colors;
};
-function luma(color) {
+function mix(c1, c2, a1, a2) {
+ c1 = rgbColor(c1);
+ c2 = rgbColor(c2);
+ if (a2 === undefined)
+ a2 = 1 - a1
+ return "rgb(" + [
+ Math.round(a1*c1[0] + a2*c2[0]),
+ Math.round(a1*c1[1] + a2*c2[1]),
+ Math.round(a1*c1[2] + a2*c2[2])
+ ].join(",") + ")";
+}
+
+function rgbColor(color) {
+ if (typeof color == "object")
+ return color;
if (color[0]=="#")
- var rgb = color.match(/^#(..)(..)(..)/).slice(1).map(function(c) {
+ return color.match(/^#(..)(..)(..)/).slice(1).map(function(c) {
return parseInt(c, 16);
});
else
- var rgb = color.match(/\(([^,]+),([^,]+),([^,]+)/).slice(1).map(function(c) {
+ return color.match(/\(([^,]+),([^,]+),([^,]+)/).slice(1).map(function(c) {
return parseInt(c, 10);
});
-
+}
+function luma(color) {
+ var rgb = rgbColor(color);
return (0.21 * rgb[0] + 0.72 * rgb[1] + 0.07 * rgb[2]) / 255;
}
diff --git a/tool/tmthemes/Katzenmilch.tmTheme b/tool/tmthemes/Katzenmilch.tmTheme
new file mode 100644
index 00000000..3878ffe9
--- /dev/null
+++ b/tool/tmthemes/Katzenmilch.tmTheme
@@ -0,0 +1,399 @@
+
+
+
+
+ name
+ Katzen-Milch
+ comment
+ Those silly germans and their cat milk! Ghee wizz!
+ settings
+
+
+ settings
+
+ background
+ #f3f2f3
+ caret
+ #100011
+ foreground
+ #0f0009ff
+ invisibles
+ #000000
+ lineHighlight
+ #ffffff
+ selection
+ #6405D044
+ selectionBorder
+ #8425f0
+ bracketContentsOptions
+ underline
+ tagsForeground
+ #0f0009ff
+ tagsOptions
+ underline
+
+
+
+ name
+ Parenthesis
+ scope
+ punctuation.definition.list
+ settings
+
+ fontStyle
+
+ foreground
+ #940494
+ background
+ #4444940a
+
+
+
+ name
+ Comment
+ scope
+ comment
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #404f50aa
+ background
+ #5f0fff02
+
+
+
+ name
+ String
+ scope
+ string
+ settings
+
+ foreground
+ #5a5f9b
+ background
+ #aaafdb09
+
+
+
+ name
+ Number
+ scope
+ constant.numeric
+ settings
+
+ foreground
+ #4f827bee
+ background
+ #77c2bb0f
+
+
+
+ name
+ User-defined Constant
+ scope
+ constant.character, constant.other
+ settings
+
+ foreground
+ #025f69ff
+ background
+ #7f229910
+
+
+
+ name
+ Built-in Constant
+ scope
+ constant.language
+ settings
+
+ fontStyle
+
+ foreground
+ #7D7e52
+ background
+ #bDbe820f
+
+
+
+ name
+ Storage Modifier
+ scope
+ storage.modifier
+ settings
+
+ fontStyle
+ bold
+ foreground
+ #7B5D8f
+ background
+ #9B9FfD0a
+
+
+
+ name
+ Storage
+ scope
+ storage
+ settings
+
+ fontStyle
+ bold
+ foreground
+ #7B5cbfff
+ background
+ #8B5Ddf0d
+
+
+
+ name
+ Function Name
+ scope
+ entity.name.function
+ settings
+
+ fontStyle
+
+ foreground
+ #025f49f7
+ background
+ #22ff491f
+
+
+
+ name
+ Support Function
+ scope
+ support.function
+ settings
+
+ foreground
+ #9D7e62
+ background
+ #bDbe820a
+
+
+
+ name
+ Misc Function
+ scope
+ entity.name.function.misc
+ settings
+
+ foreground
+ #939469
+ background
+ #E3E4A90a
+
+
+
+ name
+ Predicate Function
+ scope
+ entity.name.function.predicate
+ settings
+
+ foreground
+ #856F63
+ background
+ #A5DF930a
+
+
+
+ name
+ Input/Output Function
+ scope
+ entity.name.function.io
+ settings
+
+ foreground
+ #aF938C
+ background
+ #DFB3AC0a
+
+
+
+ name
+ External Symbol
+ scope
+ variable.other.external-symbol
+ settings
+
+ foreground
+ #7BaFaD
+ background
+ #BBDFDD0a
+
+
+
+ name
+ Variable
+ scope
+ variable.language, variable.other
+ settings
+
+ foreground
+ #316fcf
+ background
+ #3aafff0a
+
+
+
+ name
+ Parameter Variable
+ scope
+ variable.parameter
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #33969fdd
+ background
+ #05d6f90b
+
+
+
+ name
+ Keyword
+ scope
+ keyword
+ settings
+
+ foreground
+ #674Aa8
+ background
+ #A3AAD80e
+
+
+
+ name
+ Class Name
+ scope
+ entity.name.class
+ settings
+
+ fontStyle
+ bold
+ foreground
+ #B9986F
+ background
+ #B998DF22
+
+
+
+ name
+ Structure Name
+ scope
+ entity.name.structure
+ settings
+
+ foreground
+ #22af9d
+ background
+ #B998DF0a
+
+
+
+ name
+ Type Name
+ scope
+ entity.name.type
+ settings
+
+ foreground
+ #af47a9
+ background
+ #af77a90d
+
+
+
+ name
+ Class name
+ scope
+ entity.name.class, entity.name.type.class
+ settings
+
+ foreground
+ #cc4357
+ background
+ #ffddff92
+
+
+
+ name
+ Support Class
+ scope
+ support.class
+ settings
+
+ foreground
+ #ef6aa7ff
+ background
+ #ef6aa710
+
+
+
+ name
+ Invalid
+ scope
+ invalid
+ settings
+
+ background
+ #CC1B27
+ foreground
+ #DFDFD5
+
+
+
+
+ name
+ ♦ String embedded-source
+ scope
+ string source
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #13499fdd
+ background
+ #0099ff0a
+
+
+
+ name
+ Tag name
+ scope
+ entity.name.tag
+ settings
+
+ foreground
+ #3976a2
+ background
+ #49a6d20a
+
+
+
+ name
+ Tag attribute
+ scope
+ entity.other.attribute-name
+ settings
+
+ fontStyle
+
+ foreground
+ #4946c2ee
+ background
+ #4986c209
+
+
+
+
+
diff --git a/tool/tmthemes/Kuroir Theme.tmTheme b/tool/tmthemes/Kuroir Theme.tmTheme
new file mode 100644
index 00000000..36acd588
--- /dev/null
+++ b/tool/tmthemes/Kuroir Theme.tmTheme
@@ -0,0 +1,916 @@
+
+
+
+
+ author
+ Stanley Rost
+ comment
+ Kuroir
+ name
+ Kuroir Theme
+ settings
+
+
+ settings
+
+ background
+ #E8E9E8
+ caret
+ #202020
+ foreground
+ #363636
+ invisibles
+ #0000004A
+ lineHighlight
+ #CBDC2F38
+ selection
+ #F5AA0091
+
+ bracketsForeground
+ #C41717
+ bracketsOptions
+ foreground underline
+
+ bracketContentsForeground
+ #C41717
+ bracketContentsOptions
+ foreground underline background
+
+ guide
+ #8F8F8F
+ activeGuide
+ #FA2828
+
+ tagsOptions
+ stippled_underline
+
+
+
+ name
+ Comment
+ scope
+ comment
+ settings
+
+ background
+ #DCDCDC8F
+ fontStyle
+
+ foreground
+ #949494E8
+
+
+
+ name
+ Regions
+ scope
+ comment.line.region
+ settings
+
+ background
+ #E9D6DC85
+ fontStyle
+
+ foreground
+ #A54776
+
+
+
+ name
+ Line Marker
+ scope
+ comment.line.marker.php
+ settings
+
+ background
+ #E9E4BE
+ foreground
+ #668D68
+
+
+
+ name
+ Todo
+ scope
+ comment.line.todo.php
+ settings
+
+ background
+ #D9EAB8
+ fontStyle
+
+ foreground
+ #456E48
+
+
+
+ name
+ FIXME
+ scope
+ comment.line.fixme.php
+ settings
+
+ background
+ #E1D0CA
+ fontStyle
+
+ foreground
+ #880006
+
+
+
+ name
+ Constant
+ scope
+ constant
+ settings
+
+ foreground
+ #CD6839
+
+
+
+ name
+ Entity
+ scope
+ entity
+ settings
+
+ background
+ #E8E9E8
+ fontStyle
+
+ foreground
+ #8B4726
+
+
+
+ name
+ Storage
+ scope
+ storage
+ settings
+
+ fontStyle
+
+ foreground
+ #A52A2A
+
+
+
+ name
+ Keyword Control
+ scope
+ keyword.control
+ settings
+
+ foreground
+ #CD3700
+
+
+
+ name
+ Library Function
+ scope
+ support.function - variable, keyword.other.special-method.ruby
+ settings
+
+ foreground
+ #B03060
+
+
+
+ name
+ Comparison
+ scope
+ keyword.operator.comparison,keyword.operator.logical
+ settings
+
+ foreground
+ #B83126
+
+
+
+ name
+ String
+ scope
+ string
+ settings
+
+ fontStyle
+
+ foreground
+ #639300
+
+
+
+ name
+ R Interpolation
+ scope
+ string.quoted.double.ruby source.ruby.embedded.source
+ settings
+
+ foreground
+ #007E69
+
+
+
+ name
+ Support
+ scope
+ support
+ settings
+
+ fontStyle
+
+ foreground
+ #104E8B
+
+
+
+ name
+ Variable
+ scope
+ variable
+ settings
+
+ foreground
+ #009ACD
+
+
+
+ name
+ Invalid Deprecated
+ scope
+ invalid.deprecated
+ settings
+
+ background
+ #E8E9E8
+ fontStyle
+ italic underline
+ foreground
+ #FD1732
+
+
+
+ name
+ Invalid Illegal
+ scope
+ invalid.illegal
+ settings
+
+ background
+ #FF060026
+ foreground
+ #FD1224
+
+
+
+ name
+ Embedded Source (Bright)
+ scope
+ text source
+ settings
+
+ background
+ #77ADE900
+ foreground
+ #7B211A
+
+
+
+ name
+ Entity inherited-class
+ scope
+ entity.other.inherited-class
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #005273
+
+
+
+ name
+ String.regexp
+ scope
+ string.regexp
+ settings
+
+ background
+ #C9D4BE
+ foreground
+ #417E00
+
+
+
+ name
+ Support.function
+ scope
+ support.function
+ settings
+
+ fontStyle
+
+ foreground
+ #005273
+
+
+
+ name
+ Support.constant
+ scope
+ support.constant
+ settings
+
+ fontStyle
+
+ foreground
+ #CF6A4C
+
+
+
+ name
+ j Entity Name Type
+ scope
+ entity.name.type
+ settings
+
+ fontStyle
+ underline
+
+
+
+ name
+ j Cast
+ scope
+ meta.cast
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #676767
+
+
+
+ name
+ Doctype/XML Processing
+ scope
+ meta.sgml.html meta.doctype, meta.sgml.html meta.doctype entity, meta.sgml.html meta.doctype string, meta.xml-processing, meta.xml-processing entity, meta.xml-processing string
+ settings
+
+ foreground
+ #494949
+
+
+
+ name
+ Meta.tag.all
+ scope
+ meta.tag, meta.tag entity
+ settings
+
+ foreground
+ #005273
+
+
+
+ name
+ Meta.tag.inline
+ scope
+ source entity.name.tag, source entity.other.attribute-name, meta.tag.inline, meta.tag.inline entity
+ settings
+
+ foreground
+ #005273
+
+
+
+ name
+ Namespaces
+ scope
+ entity.name.tag.namespace, entity.other.attribute-name.namespace
+ settings
+
+ foreground
+ #B85423
+
+
+
+ name
+ css tag-name
+ scope
+ entity.name.tag.css
+ settings
+
+ foreground
+ #B83126
+
+
+
+ name
+ css:pseudo-class
+ scope
+ meta.selector.css entity.other.attribute-name.tag.pseudo-class
+ settings
+
+ foreground
+ #B12E25
+
+
+
+ name
+ css#id
+ scope
+ meta.selector.css entity.other.attribute-name.id,entity.other.attribute-name.id.css
+ settings
+
+ foreground
+ #B8002D
+
+
+
+ name
+ css.class
+ scope
+ meta.selector.css entity.other.attribute-name.class, entity.other.attribute-name.class.css
+ settings
+
+ foreground
+ #B8012D
+
+
+
+ name
+ css property-name:
+ scope
+ support.type.property-name.css, meta.property-name
+ settings
+
+ foreground
+ #005273
+
+
+
+ name
+ css @at-rule
+ scope
+ meta.preprocessor.at-rule keyword.control.at-rule
+ settings
+
+ foreground
+ #8693A5
+
+
+
+ name
+ css property-value;
+ scope
+ meta.property-value
+ settings
+
+ foreground
+ #417E00
+
+
+
+ name
+ css property-value color
+ scope
+ constant.other.color
+ settings
+
+ foreground
+ #B8860B
+
+
+
+ name
+ css !important / !default
+ scope
+ keyword.other.important,keyword.other.default
+ settings
+
+ foreground
+ #EE3A8C
+
+
+
+ name
+ css additional-constants
+ scope
+ meta.property-value support.constant.named-color.css, meta.property-value constant
+ settings
+
+ foreground
+ #417E00
+
+
+
+
+
+ name
+ css constructor.argument
+ scope
+ meta.constructor.argument.css
+ settings
+
+ foreground
+ #417E00
+
+
+
+ name
+ css constant.numeric
+ scope
+ constant.numeric
+ settings
+
+ foreground
+ #9A5925
+
+
+
+ name
+ css keyword.unit
+ scope
+ keyword.other
+ settings
+
+ foreground
+ #9F5E3D
+
+
+
+ name
+ css keyword.unit
+ scope
+ source.scss support.function.misc
+ settings
+
+ foreground
+ #1B76B0
+
+
+
+ name
+ diff.header
+ scope
+ meta.diff, meta.diff.header
+ settings
+
+ background
+ #82000E
+ fontStyle
+ italic
+ foreground
+ #F8BEBE
+
+
+
+ name
+ diff.deleted
+ scope
+ markup.deleted
+ settings
+
+ background
+ #420E09
+ foreground
+ #F8F8F8
+
+
+
+ name
+ diff.changed
+ scope
+ markup.changed
+ settings
+
+ background
+ #4A410D
+ foreground
+ #F8F8F8
+
+
+
+ name
+ diff.inserted
+ scope
+ markup.inserted
+ settings
+
+ background
+ #253B22
+ foreground
+ #F8F8F8
+
+
+
+ name
+ Markup: Italic
+ scope
+ markup.italic
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #CD2626
+
+
+
+ name
+ Markup: Bold
+ scope
+ markup.bold
+ settings
+
+ fontStyle
+ bold
+ foreground
+ #8B1A1A
+
+
+
+ name
+ Markup: Underline
+ scope
+ markup.underline
+ settings
+
+ fontStyle
+ underline
+ foreground
+ #E18964
+
+
+
+ name
+ Markup: Quote
+ scope
+ markup.quote
+ settings
+
+ background
+ #FEE09C12
+ fontStyle
+ italic
+ foreground
+ #8B7765
+
+
+
+ name
+ Markup: Heading
+ scope
+ markup.heading, markup.heading entity
+ settings
+
+ background
+ #BF61330D
+ fontStyle
+
+ foreground
+ #B8012D
+
+
+
+ name
+ Markup: List
+ scope
+ markup.list
+ settings
+
+ foreground
+ #8F5B26
+
+
+
+ name
+ Markup: Raw
+ scope
+ markup.raw
+ settings
+
+ background
+ #B1B3BA08
+ fontStyle
+
+ foreground
+ #578BB3
+
+
+
+ name
+ Markup: Comment
+ scope
+ markup comment
+ settings
+
+ fontStyle
+ italic
+ foreground
+ #F67B37
+
+
+
+ name
+ Markup: Separator
+ scope
+ meta.separator
+ settings
+
+ background
+ #242424
+ foreground
+ #60A633
+
+
+
+ name
+ Markup: Other
+ scope
+ markup.other
+ settings
+
+ background
+ #B1B3BA08
+ fontStyle
+
+ foreground
+ #578BB3
+
+
+
+ name
+ Log Entry
+ scope
+ meta.line.entry.logfile, meta.line.exit.logfile
+ settings
+
+ background
+ #EEEEEE29
+
+
+
+ name
+ Log Entry Error
+ scope
+ meta.line.error.logfile
+ settings
+
+ background
+ #751012
+
+
+
+ name
+ SCSS Punctuation End Comments
+ scope
+ punctuation.definition.end
+ settings
+
+ background
+ #DCDCDC8F
+ fontStyle
+
+
+
+
+ name
+ --------------------------------
+ settings
+
+
+
+ name
+ HTML Attribute name
+ scope
+ entity.other.attribute-name.html
+ settings
+
+ foreground
+ #629F9E
+
+
+
+ name
+ JS String
+ scope
+ string.quoted.double.js, string.quoted.single.js
+ settings
+
+ foreground
+ #79A316
+
+
+
+ name
+ JS Function
+ scope
+ entity.name.function.js
+ settings
+
+ foreground
+ #488C45
+ fontStyle
+ italic
+
+
+
+ name
+ JS Embedded code general
+ scope
+ source.js.embedded.html
+ settings
+
+ foreground
+ #666
+
+
+
+ name
+ JS Storage Type
+ scope
+ storage.type.js
+ settings
+
+ foreground
+ #BB3182
+
+
+
+ name
+ JS Support Class
+ scope
+ support.class.js
+ settings
+
+ foreground
+ #338FD5
+
+
+
+ name
+ JS Control Keyword
+ scope
+ keyword.control.js, keyword.operator.js
+ settings
+
+ foreground
+ #A99904
+ fontStyle
+ italic
+
+
+
+
+ name
+ Matching Pairs
+ scope
+ entity.name.class
+ settings
+
+ background
+ #D7D7A7
+ foreground
+ #616838
+ fontStyle
+
+
+
+
+ name
+ Active Guide
+ scope
+ active_guide
+ settings
+
+ background
+ #968F96
+ fontStyle
+
+
+
+
+ name
+ Highlight Matching Word
+ scope
+ highlight_matching_word
+ settings
+
+ background
+ #CBDC2F38
+ fontStyle
+
+
+
+
+ uuid
+ 467560D0-6ACE-4409-82FD-4791420837AC
+
+