Branch: refs/heads/master Author: Matthew Brush mbrush@codebrainz.ca Committer: Matthew Brush mbrush@codebrainz.ca Date: Sat, 23 Nov 2013 10:38:39 UTC Commit: 31e6ee9bc825e16d3b48c0b30e20c763480da0c4 https://github.com/geany/geany-themes/commit/31e6ee9bc825e16d3b48c0b30e20c76...
Log Message: ----------- Normalize colour notation in a bunch of schemes
Modified Paths: -------------- colorschemes/black.conf colorschemes/inkpot.conf colorschemes/kugel.conf colorschemes/monokai.conf colorschemes/pygments.conf colorschemes/steampunk.conf colorschemes/tango-dark.conf colorschemes/ubuntu.conf
Modified: colorschemes/black.conf 22 files changed, 11 insertions(+), 11 deletions(-) =================================================================== @@ -41,27 +41,27 @@ error=#ff80c0;#000;false;false # Editor styles #-------------------------------------------------------------------------------
-selection=#ff0000;#404040;false;true +selection=#f00;#404040;false;true current_line=#8dc63f;#330;true;false -brace_good=#ffff00;#000;true;false +brace_good=#ff0;#000;true;false brace_bad=#c5360f;#000;true;false margin_line_number=#b2aeab;#404040;false;false margin_folding=#222;#111;false;false fold_symbol_highlight=#fff -indent_guide=#006666;;false;false +indent_guide=#066;;false;false caret=#fff;#066;false;false marker_line=#ff208c;#80d4b2;false;false -marker_search=#ffff00;#f00;false;false +marker_search=#ff0;#f00;false;false marker_mark=#810000;#000;false;false -call_tips=#cccccc;#fff;false;false -white_space=#cccccc;;true +call_tips=#ccc;#fff;false;false +white_space=#ccc;;true
# Programming languages #-------------------------------------------------------------------------------
-comment=#ff0000 -comment_doc=#ff0000;#070707;false;false +comment=#f00 +comment_doc=#f00;#070707;false;false comment_line=comment comment_line_doc=comment_doc comment_doc_keyword=comment_doc,bold @@ -76,7 +76,7 @@ class=type function=default parameter=function
-keyword=#ff3399;;true;false +keyword=#f39;;true;false keyword_1=keyword keyword_2=#6f0;;true;false keyword_3=keyword_1 @@ -100,7 +100,7 @@ here_doc=string_2
scalar=string_2 label=default,bold -preprocessor=#ffffff +preprocessor=#fff regex=number_1 operator=#fc0 decorator=string_1,bold @@ -121,5 +121,5 @@ entity=#fff;#000;false;false #-------------------------------------------------------------------------------
line_added=#00f5ff;#000;false;false -line_removed=#ffff00;#000;false;false +line_removed=#ff0;#000;false;false line_changed=#399;#000;false;false
Modified: colorschemes/inkpot.conf 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -38,12 +38,12 @@ error=#1e1e1e;#f00;false;false selection=;#4e4e8f;false;true current_line=#000;#2d2d32;true brace_good=#cfbfad;#4e4e8f -brace_bad=#cfbfad;#ff00000 +brace_bad=#cfbfad;#f000 margin_line_number=#8b8bcd;#2e2e2e margin_folding=#000;#3e3e3e;false;false fold_symbol_highlight=#6e6e6e indent_guide=#3b3b4d;;true;false -caret=#8b8bff;#ffffff;false;false +caret=#8b8bff;#fff;false;false marker_line=#000;#ff0;false;false marker_search=#000;#b8f4b8;false;false marker_mark=#000;#b8f4b8; @@ -113,6 +113,6 @@ entity=default # Diff #-------------------------------------------------------------------------------
-line_added=#00aa00 -line_removed=#ff0000 +line_added=#0a0 +line_removed=#f00 line_changed=#e7b937
Modified: colorschemes/kugel.conf 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -47,19 +47,19 @@ error=#f00;;true;false #-------------------------------------------------------------------------------
selection=#fff;#333964;false;true -current_line=#000;#282D2E;true;false +current_line=#000;#282d2e;true;false brace_good=#fff;#50aa15;true;false brace_bad=#fff;#aa1515;true;false margin_line_number=#ececec -margin_folding=#888a85;#3A4145 +margin_folding=#888a85;#3a4145 fold_symbol_highlight=#fff -indent_guide=#606C70 +indent_guide=#606c70 caret=#ddd;#000;false marker_line=#000;#ff0; marker_search=#000;#0000f0; marker_mark=#000;#b8f4b8; call_tips=#555753;#eeeeec -white_space=#606C70;#fff;true;false +white_space=#606c70;#fff;true;false
# Programming languages #-------------------------------------------------------------------------------
Modified: colorschemes/monokai.conf 12 files changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -17,10 +17,10 @@ url=http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/ compat=1.22;1.23;1.23.1;1.24
[named_colors] -black=#000000 +black=#000 almost_black=#272822 lighter_black=#2d2e2b -yellow=#ffff00 +yellow=#ff0 light_yellow=#e6db74 very_dark_yellow=#49483e bright_orange=#fd971f @@ -31,12 +31,12 @@ dark_blue=#086aa7 light_purple=#ae81ff hot_pink=#f92672 light_cyan=#66d9ef -red=#ff0000 -green=#00ff00 -white=#ffffff +red=#f00 +green=#0f0 +white=#fff almost_white=#f8f8f2 grey=#d0d0d0 -mid_grey=#888888 +mid_grey=#888 lighter_grey=#dfdfdf dark_grey=#3b3a32
Modified: colorschemes/pygments.conf 34 files changed, 17 insertions(+), 17 deletions(-) =================================================================== @@ -46,20 +46,20 @@ error=#f00;#bfbfbf # Editor styles #-------------------------------------------------------------------------------
-selection=#2e3436;#CACACA;false;true -current_line=#2e3436;#E7E7E7;true -brace_good=#9433AD;#DCD4E0;true -brace_bad=#DDDDDD;#E0754A;true -margin_line_number=#3A4346;#D6D6D6 -margin_folding=#747474;#E1E1E1 -fold_symbol_highlight=#D6D6D6 -indent_guide=#B5B5B5 +selection=#2e3436;#cacaca;false;true +current_line=#2e3436;#e7e7e7;true +brace_good=#9433ad;#dcd4e0;true +brace_bad=#ddd;#e0754a;true +margin_line_number=#3a4346;#d6d6d6 +margin_folding=#747474;#e1e1e1 +fold_symbol_highlight=#d6d6d6 +indent_guide=#b5b5b5 caret=#000;#000;false marker_line=#2e3436;#729fcf marker_search=#2e3436;#fcaf3e -marker_mark=#565656;#D4D4D4 +marker_mark=#565656;#d4d4d4 call_tips=default -white_space=#B5B5B5;;true +white_space=#b5b5b5;;true
# Programming languages #------------------------------------------------------------------------------- @@ -75,9 +75,9 @@ number=#666 number_1=number number_2=number_1
-type=#0032FF;;true +type=#0032ff;;true class=type -function=#0026BC +function=#0026bc parameter=function
keyword=#008000;;true @@ -92,7 +92,7 @@ identifier_2=identifier_1 identifier_3=identifier_1 identifier_4=identifier_1
-string=#BA2121;;false;false +string=#ba2121;;false;false string_1=string string_2=string_1 string_3=default @@ -105,10 +105,10 @@ verbatim=string
scalar=string_2 label=default,bold -preprocessor=#AF7100 +preprocessor=#af7100 regex=number_1 operator=default -decorator=#A2F +decorator=#a2f other=default extra=#204a87
@@ -118,7 +118,7 @@ extra=#204a87 tag=#008000;;true tag_unknown=tag tag_end=tag -attribute=#0032FF;;true +attribute=#0032ff;;true attribute_unknown=attribute,italic value=string_1 entity=preprocessor @@ -126,6 +126,6 @@ entity=preprocessor # Diff #-------------------------------------------------------------------------------
-line_added=#256A1B +line_added=#256a1b line_removed=#a40000 line_changed=#ce5c00
Modified: colorschemes/steampunk.conf 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -43,7 +43,7 @@ current_line=#000;#342d1f;true brace_good=#8ab634;#514630;true brace_bad=#ce5c00;#484333;true margin_line_number=#caa223 -margin_folding=#665511;#362a1d +margin_folding=#651;#362a1d fold_symbol_highlight=#b79024;#252016 indent_guide=#b79024 caret=#d3d7cf;#000 @@ -100,7 +100,7 @@ label=default,bold preprocessor=#729f9c regex=number_1 operator=#fa5;;true -decorator=#997788;;;true +decorator=#978;;;true other=default extra=#359
Modified: colorschemes/tango-dark.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -33,7 +33,7 @@ error=#fff;#f00 selection=#000;#626d71;false;true current_line=#000;#475458;true brace_good=#fff;#647175;true;false -brace_bad=#EEA1A8;#647175;true;false +brace_bad=#eea1a8;#647175;true;false margin_line_number=#000;#d0d0d0 margin_folding=#000;#dfdfdf fold_symbol_highlight=#fff
Modified: colorschemes/ubuntu.conf 61 files changed, 30 insertions(+), 31 deletions(-) =================================================================== @@ -28,64 +28,64 @@ compat=1.22;1.23;1.23.1;1.24
[named_styles]
-default=0x000000;0xffffff;false;false -error=0xffffff;0xff0000 +default=#000;#fff;false;false +error=#fff;#f00
# Editor styles #-------------------------------------------------------------------------------
-selection=0x000000;0xc0c0c0;false;true -current_line=0x000000;0xf0f0f0;true -brace_good=0x333333;0xFFFFFF;true;false -brace_bad=0xFFFFFF;0x333333;true;false -margin_line_number=0x000000;0xd0d0d0 -margin_folding=0x000000;0xdfdfdf -fold_symbol_highlight=0xffffff -indent_guide=0xc0c0c0 -caret=0x000000;0x000000;false -marker_line=0x000000;0xffff00 -marker_search=0x000000;0x0000f0 -marker_mark=0x000000;0xb8f4b8 -call_tips=0xc0c0c0;0xffffff;false;false -white_space=0xc0c0c0;0xffffff;true;false +selection=#000;#c0c0c0;false;true +current_line=#000;#f0f0f0;true +brace_good=#333;#fff;true;false +brace_bad=#fff;#333;true;false +margin_line_number=#000;#d0d0d0 +margin_folding=#000;#dfdfdf +fold_symbol_highlight=#fff +indent_guide=#c0c0c0 +caret=#000;#000;false +marker_line=#000;#ff0 +marker_search=#000;#0000f0 +marker_mark=#000;#b8f4b8 +call_tips=#c0c0c0;#fff;false;false +white_space=#c0c0c0;#fff;true;false
# Programming languages #-------------------------------------------------------------------------------
-comment=0x808080 -comment_doc=0x595959 +comment=#808080 +comment_doc=#595959 comment_line=comment comment_line_doc=comment_doc comment_doc_keyword=comment_doc,bold comment_doc_keyword_error=comment_doc,italic
-number=0xDD4814 +number=#dd4814 number_1=number number_2=number_1
-type=0x5E2750;;true +type=#5e2750;;true class=type -function=0x000080 +function=#000080 parameter=function
-keyword=0x2C001E;;true +keyword=#2c001e;;true keyword_1=keyword -keyword_2=0x9f0200;;true +keyword_2=#9f0200;;true keyword_3=keyword_1 keyword_4=keyword_1
-identifier=0x151515 +identifier=#151515 identifier_1=identifier identifier_2=identifier_1 identifier_3=identifier_1 identifier_4=identifier_1
-string=0xDD4814 +string=#dd4814 string_1=string string_2=string_1 string_3=default string_4=default -string_eol=0x000000;0xe0c0e0 +string_eol=#000;#e0c0e0 character=string_1 backticks=string_2 here_doc=string_2 @@ -93,9 +93,9 @@ here_doc=string_2 label=default,bold preprocessor=comment_doc,bold regex=number_1 -operator=0x5E2750 +operator=#5e2750 decorator=string_1,bold -other=0x404080 +other=#404080
# Markup-type languages #------------------------------------------------------------------------------- @@ -111,7 +111,6 @@ entity=default # Diff #-------------------------------------------------------------------------------
-line_added=0x008B8B -line_removed=0x6A5ACD +line_added=#008b8b +line_removed=#6a5acd line_changed=preprocessor -
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).