WS-11.0.3 <martin@steamrunner.local Merge branch 'master'
This commit is contained in:
Martin Donnelly
commit
a539c66efc
@ -1,7 +1,7 @@
|
||||
<scheme name="Cobalt copy" version="142" parent_scheme="Default">
|
||||
<option name="LINE_SPACING" value="1.0" />
|
||||
<option name="EDITOR_FONT_SIZE" value="12" />
|
||||
<option name="EDITOR_FONT_NAME" value="Menlo" />
|
||||
<option name="EDITOR_FONT_SIZE" value="14" />
|
||||
<option name="EDITOR_FONT_NAME" value="Source Code Pro" />
|
||||
<colors>
|
||||
<option name="CARET_COLOR" value="ffffff" />
|
||||
<option name="CARET_ROW_COLOR" value="1629" />
|
||||
@ -51,6 +51,12 @@
|
||||
<option name="FOREGROUND" value="3ad900" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CLASS_NAME_ATTRIBUTES" baseAttributes="TEXT" />
|
||||
<option name="CLASS_REFERENCE">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="COFFEESCRIPT.BAD_CHARACTER">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="f8f8f8" />
|
||||
@ -194,11 +200,6 @@
|
||||
<option name="FOREGROUND" value="ff9d00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="COFFEESCRIPT.PARAMETER">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="COFFEESCRIPT.PARENTHESIS">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="e1efff" />
|
||||
@ -254,6 +255,12 @@
|
||||
<option name="FOREGROUND" value="ff80e1" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONDITIONALLY_NOT_COMPILED">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONSOLE_BLUE_OUTPUT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="c7c7ff" />
|
||||
@ -264,6 +271,11 @@
|
||||
<option name="FOREGROUND" value="6b8b8" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONSOLE_DARKGRAY_OUTPUT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="6e6e6e" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONSOLE_ERROR_OUTPUT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffb3b3" />
|
||||
@ -279,6 +291,11 @@
|
||||
<option name="FOREGROUND" value="68e868" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONSOLE_MAGENTA_BRIGHT_OUTPUT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff2eff" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONSOLE_MAGENTA_OUTPUT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff2eff" />
|
||||
@ -305,9 +322,14 @@
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONSOLE_YELLOW_BRIGHT_OUTPUT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="f8ed26" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CONSOLE_YELLOW_OUTPUT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="754200" />
|
||||
<option name="FOREGROUND" value="b1ab3b" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CSS.COMMENT">
|
||||
@ -382,9 +404,23 @@
|
||||
<option name="FONT_TYPE" value="1" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_LINE_COMMENT" />
|
||||
<option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_BLOCK_COMMENT" />
|
||||
<option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="DEFAULT_NUMBER" />
|
||||
<option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CUSTOM_NUMBER_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff628c" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="CUSTOM_STRING_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="3ad900" />
|
||||
@ -481,11 +517,6 @@
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="DEFAULT_DOC_COMMENT_TAG_VALUE">
|
||||
<value>
|
||||
<option name="FONT_TYPE" value="3" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="DEFAULT_DOC_MARKUP">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
@ -703,8 +734,14 @@
|
||||
<option name="BACKGROUND" value="30322b" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="ENUM_CONST">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff628c" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="ERRORS_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
<option name="EFFECT_COLOR" value="ff6767" />
|
||||
<option name="ERROR_STRIPE_COLOR" value="cf5b56" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
@ -902,7 +939,7 @@
|
||||
</option>
|
||||
<option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="3c3c57" />
|
||||
<option name="EFFECT_COLOR" value="fff92c" />
|
||||
<option name="ERROR_STRIPE_COLOR" value="ccccff" />
|
||||
</value>
|
||||
</option>
|
||||
@ -913,6 +950,7 @@
|
||||
</option>
|
||||
<option name="INFO_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
<option name="EFFECT_COLOR" value="333434" />
|
||||
<option name="ERROR_STRIPE_COLOR" value="ffffcc" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
@ -929,6 +967,11 @@
|
||||
<option name="FONT_TYPE" value="1" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="IVAR">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="JAVA_BLOCK_COMMENT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
@ -1052,6 +1095,11 @@
|
||||
<option name="FOREGROUND" value="80ffc2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="LABEL">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff9d00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="LESS_INJECTED_CODE">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="223545" />
|
||||
@ -1068,17 +1116,33 @@
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="LOCAL_VARIABLE_ATTRIBUTES" baseAttributes="TEXT" />
|
||||
<option name="LOG_EXPIRED_ENTRY">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="929292" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="MACRONAME">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="MATCHED_BRACE_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="3a6da0" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="MESSAGE_ARGUMENT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="NOT_USED_ELEMENT_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="fff92c" />
|
||||
<option name="BACKGROUND" value="ff0004" />
|
||||
<option name="EFFECT_COLOR" value="ff7522" />
|
||||
<option name="EFFECT_TYPE" value="1" />
|
||||
<option name="EFFECT_COLOR" value="3afcff" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.BADCHARACTER">
|
||||
@ -1093,17 +1157,6 @@
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.CLASS_REFERENCE">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.CONDITIONALLY_NOT_COMPILED">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.CPP_KEYWORD">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff9d00" />
|
||||
@ -1114,11 +1167,6 @@
|
||||
<option name="FOREGROUND" value="ff9d00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.ENUM_CONST">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff628c" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.EXTERN_VARIABLE">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
@ -1134,21 +1182,11 @@
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.IVAR">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.KEYWORD">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff9d00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.LABEL">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff9d00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.LINE_COMMENT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
@ -1160,16 +1198,6 @@
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.MACRONAME">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.MESSAGE_ARGUMENT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.NUMBER">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff628c" />
|
||||
@ -1185,11 +1213,6 @@
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.PROTOCOL_REFERENCE">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.SELFSUPERTHIS">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff80e1" />
|
||||
@ -1205,9 +1228,25 @@
|
||||
<option name="FOREGROUND" value="ff628c" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="OC.TYPEDEF">
|
||||
<option name="OC_FORMAT_TOKEN">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffee80" />
|
||||
<option name="FOREGROUND" value="3ad900" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="PARAMETER_ATTRIBUTES" baseAttributes="TEXT" />
|
||||
<option name="PHP_PARAMETER">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="PHP_VAR">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff80e1" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="PROTOCOL_REFERENCE">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="PUPPET_BAD_CHARACTER">
|
||||
@ -1395,6 +1434,11 @@
|
||||
<option name="FOREGROUND" value="ff628c" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="REST.BOLD">
|
||||
<value>
|
||||
<option name="FONT_TYPE" value="1" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="REST.EXPLICIT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff9d00" />
|
||||
@ -1420,6 +1464,11 @@
|
||||
<option name="BACKGROUND" value="4d5d3d" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="REST.ITALIC">
|
||||
<value>
|
||||
<option name="FONT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="REST.LINE_COMMENT">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="88ff" />
|
||||
@ -1478,11 +1527,6 @@
|
||||
<option name="BACKGROUND" value="800f00" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="RUBY_BRACES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="e1efff" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="RUBY_BRACKETS">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="e1efff" />
|
||||
@ -1616,11 +1660,6 @@
|
||||
<option name="FOREGROUND" value="cccccc" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="RUBY_PARENTHESES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="e1efff" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="RUBY_REGEXP">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="80ffc2" />
|
||||
@ -1799,41 +1838,6 @@
|
||||
<option name="FOREGROUND" value="e1efff" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="SPY-JS.EXCEPTION">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="532b2e" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="SPY-JS.FUNCTION_SCOPE">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="3a3a3a" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="SPY-JS.PATH_LEVEL_ONE">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="425f44" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="SPY-JS.PATH_LEVEL_TWO">
|
||||
<value>
|
||||
<option name="EFFECT_COLOR" value="a9b7c6" />
|
||||
<option name="EFFECT_TYPE" value="1" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="SPY-JS.PROGRAM_SCOPE">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="3a3a3a" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="SPY-JS.VALUE_HINT">
|
||||
<value>
|
||||
<option name="EFFECT_COLOR" value="a9b7c6" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="STATIC_FIELD_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="fda5ff" />
|
||||
@ -1864,6 +1868,11 @@
|
||||
<option name="ERROR_STRIPE_COLOR" value="ff" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="TYPEDEF">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffee80" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="UNMATCHED_BRACE_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="BACKGROUND" value="583535" />
|
||||
@ -1888,6 +1897,13 @@
|
||||
<option name="BACKGROUND" value="623062" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="WRONG_REFERENCES_ATTRIBUTES">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ff0000" />
|
||||
<option name="EFFECT_COLOR" value="ffffff" />
|
||||
<option name="EFFECT_TYPE" value="2" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="XML_ATTRIBUTE_NAME">
|
||||
<value>
|
||||
<option name="FOREGROUND" value="ffdd00" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user