Merge pull request #1018 from ZyX-I/solarized-colors-names

Use color names specific to solarized
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2014-08-24 22:09:28 +04:00
commit 9ee8e6976b
6 changed files with 194 additions and 195 deletions

View File

@ -16,6 +16,7 @@
"darkestblue": 24, "darkestblue": 24,
"darkblue": 31, "darkblue": 31,
"red": 1,
"darkestred": 52, "darkestred": 52,
"darkred": 88, "darkred": 88,
"mediumred": 124, "mediumred": 124,
@ -45,25 +46,6 @@
"gray9": 250, "gray9": 250,
"gray10": 252, "gray10": 252,
"gray61": [14, "93a1a1"],
"gray13": [8, "002b36"],
"royalblue5": [0, "073642"],
"darkgreencopper": [10, "586e75"],
"lightskyblue4": [11, "657b83"],
"azure4": [12, "839496"],
"lightyellow": [7, "eee8d5"],
"oldlace": [15, "fdf6e3"],
"green": [2, "719e07"],
"cyan": [6, "2aa198"],
"blue": [4, "268bd2"],
"red": [1, "dc322f"],
"magenta": [5, "d33682"],
"violet": [13, "6c71c4"],
"orange": [9, "cb4b16"],
"yellow": [3, "b58900"],
"lightyellowgreen": 106, "lightyellowgreen": 106,
"gold3": 178, "gold3": 178,
"orangered": 202, "orangered": 202,
@ -71,7 +53,24 @@
"steelblue": 67, "steelblue": 67,
"darkorange3": 166, "darkorange3": 166,
"skyblue1": 117, "skyblue1": 117,
"khaki1": 228 "khaki1": 228,
"solarized:base03": [8, "002b36"],
"solarized:base02": [0, "073642"],
"solarized:base01": [10, "586e75"],
"solarized:base00": [11, "657b83"],
"solarized:base0": [12, "839496"],
"solarized:base1": [14, "93a1a1"],
"solarized:base2": [7, "eee8d5"],
"solarized:base3": [15, "fdf6e3"],
"solarized:yellow": [3, "b58900"],
"solarized:orange": [9, "cb4b16"],
"solarized:red": [1, "dc322f"],
"solarized:magenta": [5, "d33682"],
"solarized:violet": [13, "6c71c4"],
"solarized:blue": [4, "268bd2"],
"solarized:cyan": [6, "2aa198"],
"solarized:green": [2, "859900"]
}, },
"gradients": { "gradients": {
"dark_GREEN_Orange_red": [ "dark_GREEN_Orange_red": [

View File

@ -1,15 +1,15 @@
{ {
"name": "Solarized dark for shell", "name": "Solarized dark for shell",
"groups": { "groups": {
"jobnum": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, "jobnum": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
"exit_fail": { "fg": "oldlace", "bg": "red", "attr": [] }, "exit_fail": { "fg": "solarized:base3", "bg": "solarized:red", "attr": [] },
"exit_success": { "fg": "oldlace", "bg": "green", "attr": [] }, "exit_success": { "fg": "solarized:base3", "bg": "solarized:green", "attr": [] },
"mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:green", "attr": ["bold"] }
}, },
"mode_translations": { "mode_translations": {
"vicmd": { "vicmd": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:blue", "attr": ["bold"] }
} }
} }
} }

View File

@ -1,18 +1,18 @@
{ {
"name": "Solarized dark", "name": "Solarized dark",
"groups": { "groups": {
"background": { "fg": "oldlace", "bg": "royalblue5", "attr": [] }, "background": { "fg": "solarized:base3", "bg": "solarized:base02", "attr": [] },
"user": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] }, "user": { "fg": "solarized:base3", "bg": "solarized:blue", "attr": ["bold"] },
"superuser": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }, "superuser": { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] },
"virtualenv": { "fg": "oldlace", "bg": "green", "attr": [] }, "virtualenv": { "fg": "solarized:base3", "bg": "solarized:green", "attr": [] },
"branch": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, "branch": { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
"branch_dirty": { "fg": "yellow", "bg": "royalblue5", "attr": [] }, "branch_dirty": { "fg": "solarized:yellow", "bg": "solarized:base02", "attr": [] },
"branch_clean": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, "branch_clean": { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
"cwd": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, "cwd": { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
"cwd:current_folder": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, "cwd:current_folder": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": ["bold"] },
"cwd:divider": { "fg": "gray61", "bg": "darkgreencopper", "attr": [] }, "cwd:divider": { "fg": "solarized:base1", "bg": "solarized:base01", "attr": [] },
"hostname": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, "hostname": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
"environment": { "fg": "oldlace", "bg": "green", "attr": [] }, "environment": { "fg": "solarized:base3", "bg": "solarized:green", "attr": [] },
"attached_clients": { "fg": "oldlace", "bg": "green", "attr": [] } "attached_clients": { "fg": "solarized:base3", "bg": "solarized:green", "attr": [] }
} }
} }

View File

@ -1,115 +1,115 @@
{ {
"name": "Solarized dark for vim", "name": "Solarized dark for vim",
"groups": { "groups": {
"information:additional": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, "information:additional": { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
"information:unimportant": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, "information:unimportant": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
"background": { "fg": "oldlace", "bg": "royalblue5", "attr": [] }, "background": { "fg": "solarized:base3", "bg": "solarized:base02", "attr": [] },
"background:divider": { "fg": "lightskyblue4", "bg": "royalblue5", "attr": [] }, "background:divider": { "fg": "solarized:base00", "bg": "solarized:base02", "attr": [] },
"mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] }, "mode": { "fg": "solarized:base3", "bg": "solarized:green", "attr": ["bold"] },
"visual_range": { "fg": "green", "bg": "oldlace", "attr": ["bold"] }, "visual_range": { "fg": "solarized:green", "bg": "solarized:base3", "attr": ["bold"] },
"modified_indicator": { "fg": "yellow", "bg": "darkgreencopper", "attr": ["bold"] }, "modified_indicator": { "fg": "solarized:yellow", "bg": "solarized:base01", "attr": ["bold"] },
"paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }, "paste_indicator": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] },
"readonly_indicator": { "fg": "red", "bg": "darkgreencopper", "attr": [] }, "readonly_indicator": { "fg": "solarized:red", "bg": "solarized:base01", "attr": [] },
"branch_dirty": { "fg": "yellow", "bg": "darkgreencopper", "attr": [] }, "branch_dirty": { "fg": "solarized:yellow", "bg": "solarized:base01", "attr": [] },
"branch:divider": { "fg": "gray61", "bg": "darkgreencopper", "attr": [] }, "branch:divider": { "fg": "solarized:base1", "bg": "solarized:base01", "attr": [] },
"file_name": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, "file_name": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": ["bold"] },
"window_title": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, "window_title": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
"file_name_no_file": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, "file_name_no_file": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": ["bold"] },
"file_format": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, "file_format": { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
"file_vcs_status": { "fg": "red", "bg": "darkgreencopper", "attr": [] }, "file_vcs_status": { "fg": "solarized:red", "bg": "solarized:base01", "attr": [] },
"file_vcs_status_M": { "fg": "yellow", "bg": "darkgreencopper", "attr": [] }, "file_vcs_status_M": { "fg": "solarized:yellow", "bg": "solarized:base01", "attr": [] },
"file_vcs_status_A": { "fg": "green", "bg": "darkgreencopper", "attr": [] }, "file_vcs_status_A": { "fg": "solarized:green", "bg": "solarized:base01", "attr": [] },
"line_percent": { "fg": "oldlace", "bg": "lightskyblue4", "attr": [] }, "line_percent": { "fg": "solarized:base3", "bg": "solarized:base00", "attr": [] },
"line_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "lightskyblue4", "attr": [] }, "line_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attr": [] },
"position": { "fg": "oldlace", "bg": "lightskyblue4", "attr": [] }, "position": { "fg": "solarized:base3", "bg": "solarized:base00", "attr": [] },
"position_gradient": { "fg": "green_yellow_orange_red", "bg": "lightskyblue4", "attr": [] }, "position_gradient": { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attr": [] },
"line_current": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, "line_current": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
"line_current_symbol": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, "line_current_symbol": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
"virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "lightyellow", "attr": [] }, "virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "solarized:base2", "attr": [] },
"col_current": { "fg": "azure4", "bg": "lightyellow", "attr": [] }, "col_current": { "fg": "solarized:base0", "bg": "solarized:base2", "attr": [] },
"environment": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, "environment": { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
"attached_clients": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, "attached_clients": { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
"error": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }, "error": { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] },
"warning": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }, "warning": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] },
"current_tag": { "fg": "oldlace", "bg": "royalblue5", "attr": ["bold"] } "current_tag": { "fg": "solarized:base3", "bg": "solarized:base02", "attr": ["bold"] }
}, },
"mode_translations": { "mode_translations": {
"nc": { "nc": {
"colors": { "colors": {
"darkgreencopper": "royalblue5", "solarized:base01": "solarized:base02",
"lightskyblue4": "royalblue5", "solarized:base00": "solarized:base02",
"azure4": "darkgreencopper", "solarized:base0": "solarized:base01",
"gray61": "lightskyblue4", "solarized:base1": "solarized:base00",
"lightyellow": "azure4", "solarized:base2": "solarized:base0",
"oldlace": "gray61" "solarized:base3": "solarized:base1"
} }
}, },
"tab_nc": { "tab_nc": {
"colors": { "colors": {
"darkgreencopper": "royalblue5", "solarized:base01": "solarized:base02",
"lightskyblue4": "royalblue5", "solarized:base00": "solarized:base02",
"azure4": "darkgreencopper", "solarized:base0": "solarized:base01",
"gray61": "lightskyblue4", "solarized:base1": "solarized:base00",
"lightyellow": "azure4", "solarized:base2": "solarized:base0",
"oldlace": "gray61" "solarized:base3": "solarized:base1"
} }
}, },
"buf_nc": { "buf_nc": {
"colors": { "colors": {
"darkgreencopper": "royalblue5", "solarized:base01": "solarized:base02",
"lightskyblue4": "royalblue5", "solarized:base00": "solarized:base02",
"azure4": "darkgreencopper", "solarized:base0": "solarized:base01",
"gray61": "lightskyblue4", "solarized:base1": "solarized:base00",
"lightyellow": "azure4", "solarized:base2": "solarized:base0",
"oldlace": "gray61" "solarized:base3": "solarized:base1"
} }
}, },
"i": { "i": {
"groups": { "groups": {
"background": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, "background": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
"background:divider": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, "background:divider": { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
"mode": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] }, "mode": { "fg": "solarized:base3", "bg": "solarized:blue", "attr": ["bold"] },
"modified_indicator": { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] }, "modified_indicator": { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": ["bold"] },
"paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }, "paste_indicator": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] },
"readonly_indicator": { "fg": "red", "bg": "lightyellow", "attr": [] }, "readonly_indicator": { "fg": "solarized:red", "bg": "solarized:base2", "attr": [] },
"branch": { "fg": "darkgreencopper", "bg": "lightyellow", "attr": [] }, "branch": { "fg": "solarized:base01", "bg": "solarized:base2", "attr": [] },
"branch:divider": { "fg": "lightskyblue4", "bg": "lightyellow", "attr": [] }, "branch:divider": { "fg": "solarized:base00", "bg": "solarized:base2", "attr": [] },
"file_directory": { "fg": "darkgreencopper", "bg": "lightyellow", "attr": [] }, "file_directory": { "fg": "solarized:base01", "bg": "solarized:base2", "attr": [] },
"file_name": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] }, "file_name": { "fg": "solarized:base02", "bg": "solarized:base2", "attr": ["bold"] },
"file_size": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, "file_size": { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
"file_name_no_file": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] }, "file_name_no_file": { "fg": "solarized:base02", "bg": "solarized:base2", "attr": ["bold"] },
"file_name_empty": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, "file_name_empty": { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
"file_format": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, "file_format": { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
"file_vcs_status": { "fg": "red", "bg": "lightyellow", "attr": [] }, "file_vcs_status": { "fg": "solarized:red", "bg": "solarized:base2", "attr": [] },
"file_vcs_status_M": { "fg": "yellow", "bg": "lightyellow", "attr": [] }, "file_vcs_status_M": { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": [] },
"file_vcs_status_A": { "fg": "green", "bg": "lightyellow", "attr": [] }, "file_vcs_status_A": { "fg": "solarized:green", "bg": "solarized:base2", "attr": [] },
"line_percent": { "fg": "oldlace", "bg": "gray61", "attr": [] }, "line_percent": { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
"line_percent_gradient": { "fg": "oldlace", "bg": "gray61", "attr": [] }, "line_percent_gradient": { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
"position": { "fg": "oldlace", "bg": "gray61", "attr": [] }, "position": { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
"position_gradient": { "fg": "oldlace", "bg": "gray61", "attr": [] }, "position_gradient": { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
"line_current": { "fg": "gray13", "bg": "oldlace", "attr": ["bold"] }, "line_current": { "fg": "solarized:base03", "bg": "solarized:base3", "attr": ["bold"] },
"line_current_symbol": { "fg": "gray13", "bg": "oldlace", "attr": [] }, "line_current_symbol": { "fg": "solarized:base03", "bg": "solarized:base3", "attr": [] },
"col_current": { "fg": "azure4", "bg": "oldlace", "attr": [] } "col_current": { "fg": "solarized:base0", "bg": "solarized:base3", "attr": [] }
} }
}, },
"v": { "v": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
} }
}, },
"V": { "V": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
} }
}, },
"^V": { "^V": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
} }
}, },
"R": { "R": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] }
} }
} }
} }

View File

@ -1,115 +1,115 @@
{ {
"name": "Solarized light for vim", "name": "Solarized light for vim",
"groups": { "groups": {
"information:additional": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, "information:additional": { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
"information:unimportant": { "fg": "gray61", "bg": "darkgreencopper", "attr": [] }, "information:unimportant": { "fg": "solarized:base1", "bg": "solarized:base01", "attr": [] },
"background": { "fg": "gray13", "bg": "darkgreencopper", "attr": [] }, "background": { "fg": "solarized:base03", "bg": "solarized:base01", "attr": [] },
"background:divider": { "fg": "azure4", "bg": "darkgreencopper", "attr": [] }, "background:divider": { "fg": "solarized:base0", "bg": "solarized:base01", "attr": [] },
"mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] }, "mode": { "fg": "solarized:base3", "bg": "solarized:green", "attr": ["bold"] },
"visual_range": { "fg": "green", "bg": "oldlace", "attr": ["bold"] }, "visual_range": { "fg": "solarized:green", "bg": "solarized:base3", "attr": ["bold"] },
"modified_indicator": { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] }, "modified_indicator": { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": ["bold"] },
"paste_indicator": { "fg": "red", "bg": "lightyellow", "attr": ["bold"] }, "paste_indicator": { "fg": "solarized:red", "bg": "solarized:base2", "attr": ["bold"] },
"readonly_indicator": { "fg": "red", "bg": "lightyellow", "attr": [] }, "readonly_indicator": { "fg": "solarized:red", "bg": "solarized:base2", "attr": [] },
"branch_dirty": { "fg": "yellow", "bg": "lightyellow", "attr": [] }, "branch_dirty": { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": [] },
"branch:divider": { "fg": "gray61", "bg": "lightyellow", "attr": [] }, "branch:divider": { "fg": "solarized:base1", "bg": "solarized:base2", "attr": [] },
"file_name": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, "file_name": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
"window_title": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, "window_title": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
"file_size": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, "file_size": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
"file_name_no_file": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, "file_name_no_file": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
"file_name_empty": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, "file_name_empty": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
"file_vcs_status": { "fg": "red", "bg": "lightyellow", "attr": [] }, "file_vcs_status": { "fg": "solarized:red", "bg": "solarized:base2", "attr": [] },
"file_vcs_status_M": { "fg": "yellow", "bg": "lightyellow", "attr": [] }, "file_vcs_status_M": { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": [] },
"file_vcs_status_A": { "fg": "green", "bg": "lightyellow", "attr": [] }, "file_vcs_status_A": { "fg": "solarized:green", "bg": "solarized:base2", "attr": [] },
"line_percent": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, "line_percent": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
"line_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "lightyellow", "attr": [] }, "line_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attr": [] },
"position": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, "position": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
"position_gradient": { "fg": "green_yellow_orange_red", "bg": "lightyellow", "attr": [] }, "position_gradient": { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attr": [] },
"line_current": { "fg": "oldlace", "bg": "royalblue5", "attr": ["bold"] }, "line_current": { "fg": "solarized:base3", "bg": "solarized:base02", "attr": ["bold"] },
"line_current_symbol": { "fg": "oldlace", "bg": "royalblue5", "attr": [] }, "line_current_symbol": { "fg": "solarized:base3", "bg": "solarized:base02", "attr": [] },
"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "royalblue5", "attr": [] }, "virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base02", "attr": [] },
"col_current": { "fg": "lightskyblue4", "bg": "royalblue5", "attr": [] }, "col_current": { "fg": "solarized:base00", "bg": "solarized:base02", "attr": [] },
"error": { "fg": "gray13", "bg": "red", "attr": ["bold"] }, "error": { "fg": "solarized:base03", "bg": "solarized:red", "attr": ["bold"] },
"warning": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, "warning": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
"current_tag": { "fg": "gray13", "bg": "darkgreencopper", "attr": ["bold"] } "current_tag": { "fg": "solarized:base03", "bg": "solarized:base01", "attr": ["bold"] }
}, },
"mode_translations": { "mode_translations": {
"nc": { "nc": {
"colors": { "colors": {
"lightyellow": "darkgreencopper", "solarized:base2": "solarized:base01",
"azure4": "darkgreencopper", "solarized:base0": "solarized:base01",
"lightskyblue4": "lightyellow", "solarized:base00": "solarized:base2",
"gray61": "azure4", "solarized:base1": "solarized:base0",
"royalblue5": "lightskyblue4", "solarized:base02": "solarized:base00",
"gray13": "gray61" "solarized:base03": "solarized:base1"
} }
}, },
"tab_nc": { "tab_nc": {
"colors": { "colors": {
"lightyellow": "darkgreencopper", "solarized:base2": "solarized:base01",
"azure4": "darkgreencopper", "solarized:base0": "solarized:base01",
"lightskyblue4": "lightyellow", "solarized:base00": "solarized:base2",
"gray61": "azure4", "solarized:base1": "solarized:base0",
"royalblue5": "lightskyblue4", "solarized:base02": "solarized:base00",
"gray13": "gray61" "solarized:base03": "solarized:base1"
} }
}, },
"buf_nc": { "buf_nc": {
"colors": { "colors": {
"lightyellow": "darkgreencopper", "solarized:base2": "solarized:base01",
"azure4": "darkgreencopper", "solarized:base0": "solarized:base01",
"lightskyblue4": "lightyellow", "solarized:base00": "solarized:base2",
"gray61": "azure4", "solarized:base1": "solarized:base0",
"royalblue5": "lightskyblue4", "solarized:base02": "solarized:base00",
"gray13": "gray61" "solarized:base03": "solarized:base1"
} }
}, },
"i": { "i": {
"groups": { "groups": {
"background": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, "background": { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
"background:divider": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, "background:divider": { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
"mode": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] }, "mode": { "fg": "solarized:base3", "bg": "solarized:blue", "attr": ["bold"] },
"modified_indicator": { "fg": "yellow", "bg": "royalblue5", "attr": ["bold"] }, "modified_indicator": { "fg": "solarized:yellow", "bg": "solarized:base02", "attr": ["bold"] },
"paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }, "paste_indicator": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] },
"readonly_indicator": { "fg": "red", "bg": "royalblue5", "attr": [] }, "readonly_indicator": { "fg": "solarized:red", "bg": "solarized:base02", "attr": [] },
"branch": { "fg": "lightyellow", "bg": "royalblue5", "attr": [] }, "branch": { "fg": "solarized:base2", "bg": "solarized:base02", "attr": [] },
"branch:divider": { "fg": "azure4", "bg": "royalblue5", "attr": [] }, "branch:divider": { "fg": "solarized:base0", "bg": "solarized:base02", "attr": [] },
"file_directory": { "fg": "lightyellow", "bg": "royalblue5", "attr": [] }, "file_directory": { "fg": "solarized:base2", "bg": "solarized:base02", "attr": [] },
"file_name": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": ["bold"] }, "file_name": { "fg": "solarized:base01", "bg": "solarized:base02", "attr": ["bold"] },
"file_size": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": [] }, "file_size": { "fg": "solarized:base01", "bg": "solarized:base02", "attr": [] },
"file_name_no_file": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": ["bold"] }, "file_name_no_file": { "fg": "solarized:base01", "bg": "solarized:base02", "attr": ["bold"] },
"file_name_empty": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": [] }, "file_name_empty": { "fg": "solarized:base01", "bg": "solarized:base02", "attr": [] },
"file_format": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, "file_format": { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
"file_vcs_status": { "fg": "red", "bg": "royalblue5", "attr": [] }, "file_vcs_status": { "fg": "solarized:red", "bg": "solarized:base02", "attr": [] },
"file_vcs_status_M": { "fg": "yellow", "bg": "royalblue5", "attr": [] }, "file_vcs_status_M": { "fg": "solarized:yellow", "bg": "solarized:base02", "attr": [] },
"file_vcs_status_A": { "fg": "green", "bg": "royalblue5", "attr": [] }, "file_vcs_status_A": { "fg": "solarized:green", "bg": "solarized:base02", "attr": [] },
"line_percent": { "fg": "gray13", "bg": "gray61", "attr": [] }, "line_percent": { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
"line_percent_gradient": { "fg": "gray13", "bg": "gray61", "attr": [] }, "line_percent_gradient": { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
"position": { "fg": "gray13", "bg": "gray61", "attr": [] }, "position": { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
"position_gradient": { "fg": "gray13", "bg": "gray61", "attr": [] }, "position_gradient": { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
"line_current": { "fg": "oldlace", "bg": "gray13", "attr": ["bold"] }, "line_current": { "fg": "solarized:base3", "bg": "solarized:base03", "attr": ["bold"] },
"line_current_symbol": { "fg": "oldlace", "bg": "gray13", "attr": [] }, "line_current_symbol": { "fg": "solarized:base3", "bg": "solarized:base03", "attr": [] },
"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "gray13", "attr": [] }, "virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base03", "attr": [] },
"col_current": { "fg": "lightskyblue4", "bg": "gray13", "attr": [] } "col_current": { "fg": "solarized:base00", "bg": "solarized:base03", "attr": [] }
} }
}, },
"v": { "v": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
} }
}, },
"V": { "V": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
} }
}, },
"^V": { "^V": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
} }
}, },
"R": { "R": {
"groups": { "groups": {
"mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] } "mode": { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] }
} }
} }
} }

View File

@ -315,9 +315,9 @@ class Spec(object):
def ident(self, msg_func=None): def ident(self, msg_func=None):
msg_func = ( msg_func = (
msg_func msg_func
or (lambda value: 'String "{0}" is not an alphanumeric/underscore identifier'.format(value)) or (lambda value: 'String "{0}" is not an alphanumeric/underscore colon-separated identifier'.format(value))
) )
return self.re('^\w+$', msg_func) return self.re('^\w+(?::\w+)?$', msg_func)
def oneof(self, collection, msg_func=None): def oneof(self, collection, msg_func=None):
msg_func = msg_func or (lambda value: '"{0}" must be one of {1!r}'.format(value, list(collection))) msg_func = msg_func or (lambda value: '"{0}" must be one of {1!r}'.format(value, list(collection)))
@ -701,7 +701,7 @@ def check_group(group, data, context, echoerr):
color_spec = Spec().type(unicode).func(check_color).copy color_spec = Spec().type(unicode).func(check_color).copy
name_spec = Spec().type(unicode).len('gt', 0).optional().copy name_spec = Spec().type(unicode).len('gt', 0).optional().copy
group_name_spec = Spec().re('^\w+(?::\w+)?$').copy group_name_spec = Spec().ident().copy
group_spec = Spec().either(Spec( group_spec = Spec().either(Spec(
fg=color_spec(), fg=color_spec(),
bg=color_spec(), bg=color_spec(),