diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-03 21:48:00 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-03 21:48:00 +0300 |
commit | 55aadccbde3a44f9e9a7046f1478e31e2475f60c (patch) | |
tree | cab220402c0b742b9af330ca02d0ee913a9029c2 /release/scripts/presets | |
parent | 72473a61b0a45cf31a42927e9b86d0f26a25590d (diff) | |
parent | 103fbb3afc076383b94910e535374c5db398d06c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/presets')
10 files changed, 10 insertions, 120 deletions
diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml index 3b2b9b99ed2..915e9cb64f1 100644 --- a/release/scripts/presets/interface_theme/back_to_black.xml +++ b/release/scripts/presets/interface_theme/back_to_black.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#354d66" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#b1b1b1" - active_file_text="#ffffff"> + <ThemeFileBrowser selected_file="#354d66"> <space> <ThemeSpaceGeneric back="#000000" title="#5d5d5d" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#181818" - list_title="#9e9e9e" - list_text="#5d5d5d" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml index 90730aeaebc..818e557adf0 100644 --- a/release/scripts/presets/interface_theme/blender_24x.xml +++ b/release/scripts/presets/interface_theme/blender_24x.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#a0a0d0" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#828282" - active_file_text="#ffffff"> + <ThemeFileBrowser selected_file="#a0a0d0"> <space> <ThemeSpaceGeneric back="#808080" title="#000000" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#b4b4b4" - list_title="#000000" - list_text="#000000" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml index 20c88363aa9..7a3d5146636 100644 --- a/release/scripts/presets/interface_theme/elsyiun.xml +++ b/release/scripts/presets/interface_theme/elsyiun.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#755129" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#828282" - active_file_text="#fafafa"> + <ThemeFileBrowser selected_file="#755129"> <space> <ThemeSpaceGeneric back="#4b4b4b" title="#8b8b8b" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#3b3b3b" - list_title="#8b8b8b" - list_text="#8b8b8b" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/flatty_light.xml b/release/scripts/presets/interface_theme/flatty_light.xml index f9fed2d97da..623e0b334dd 100644 --- a/release/scripts/presets/interface_theme/flatty_light.xml +++ b/release/scripts/presets/interface_theme/flatty_light.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#ff8c19" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#828282" - active_file_text="#fafafa"> + <ThemeFileBrowser selected_file="#ff8c19"> <space> <ThemeSpaceGeneric back="#404040" title="#000000" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#808080" - list_title="#000000" - list_text="#000000" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/graph.xml b/release/scripts/presets/interface_theme/graph.xml index 4943bf3b4d5..a032d8bd3b2 100644 --- a/release/scripts/presets/interface_theme/graph.xml +++ b/release/scripts/presets/interface_theme/graph.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#607f9e" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#ffffff" - active_file_text="#ffffff"> + <ThemeFileBrowser selected_file="#607f9e"> <space> <ThemeSpaceGeneric back="#4b4b4b" title="#e4e4e4" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#3b3b3b" - list_title="#8b8b8b" - list_text="#8b8b8b" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml index 1db4db0cb47..4b24abc5fa7 100644 --- a/release/scripts/presets/interface_theme/hexagon.xml +++ b/release/scripts/presets/interface_theme/hexagon.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#69a5be" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#859cb9" - active_file_text="#fafafa"> + <ThemeFileBrowser selected_file="#69a5be"> <space> <ThemeSpaceGeneric back="#646875" title="#000000" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#6c717f" - list_title="#d7d7d7" - list_text="#d7d7d7" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/rtheme.xml b/release/scripts/presets/interface_theme/rtheme.xml index 1f187695909..27f33aa2fe5 100644 --- a/release/scripts/presets/interface_theme/rtheme.xml +++ b/release/scripts/presets/interface_theme/rtheme.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#ff8c19" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#828282" - active_file_text="#fafafa"> + <ThemeFileBrowser selected_file="#ff8c19"> <space> <ThemeSpaceGeneric back="#9098a0" title="#000000" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#484848" - list_title="#000000" - list_text="#000000" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/science_lab.xml b/release/scripts/presets/interface_theme/science_lab.xml index 7ebaa68b5a6..9341e945375 100644 --- a/release/scripts/presets/interface_theme/science_lab.xml +++ b/release/scripts/presets/interface_theme/science_lab.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#517da1" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#828282" - active_file_text="#fafafa"> + <ThemeFileBrowser selected_file="#517da1"> <space> <ThemeSpaceGeneric back="#363636" title="#646464" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#444444" - list_title="#c0c0c0" - list_text="#999999" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/softimage.xml b/release/scripts/presets/interface_theme/softimage.xml index 619af7c5e52..ab0a5994838 100644 --- a/release/scripts/presets/interface_theme/softimage.xml +++ b/release/scripts/presets/interface_theme/softimage.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#f1e593" - scrollbar="#4d4b4d" - scroll_handle="#8c8a88" - active_file="#f1e593" - active_file_text="#ffffff"> + <ThemeFileBrowser selected_file="#f1e593"> <space> <ThemeSpaceGeneric back="#aca8a7" title="#ffffff" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#aaa8a6" - list_title="#3a3a3a" - list_text="#7f7f7f" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml index a319b0be5c0..184ea4214a4 100644 --- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml +++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -398,11 +398,7 @@ </ThemeGraphEditor> </graph_editor> <file_browser> - <ThemeFileBrowser selected_file="#6b395a" - scrollbar="#a0a0a0" - scroll_handle="#7f7070" - active_file="#eeedeb" - active_file_text="#ffffff"> + <ThemeFileBrowser selected_file="#6b395a"> <space> <ThemeSpaceGeneric back="#131311" title="#000000" @@ -428,13 +424,6 @@ </panelcolors> </ThemeSpaceGeneric> </space> - <space_list> - <ThemeSpaceListGeneric list="#3c3b37" - list_title="#95948f" - list_text="#95948f" - list_text_hi="#ffffff"> - </ThemeSpaceListGeneric> - </space_list> </ThemeFileBrowser> </file_browser> <nla_editor> |