From: Ben Soares Date: Thu, 10 Dec 2020 19:56:14 +0000 (+0000) Subject: Merge branch 'task/JAL-3594_updated--CHANNEL_cosmetics' into develop X-Git-Tag: Develop-2_11_2_0-d20201215~12 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=225f7f621ba32ba196f3c7805c79c85b32faa5e5;hp=435bdfd0a2072ee6562d15eb3c9676eaba1b7a1b;p=jalview.git Merge branch 'task/JAL-3594_updated--CHANNEL_cosmetics' into develop --- diff --git a/utils/channels/develop/images/jalview_develop_banner.xcf b/utils/channels/develop/images/jalview_develop_banner.xcf index a17b450..cc26868 100644 Binary files a/utils/channels/develop/images/jalview_develop_banner.xcf and b/utils/channels/develop/images/jalview_develop_banner.xcf differ diff --git a/utils/channels/develop/resources/images/jalview_develop_banner.png b/utils/channels/develop/resources/images/jalview_develop_banner.png index 7f32061..bd3dfe1 100644 Binary files a/utils/channels/develop/resources/images/jalview_develop_banner.png and b/utils/channels/develop/resources/images/jalview_develop_banner.png differ diff --git a/utils/channels/test-release/images/jalview_test-release_banner.xcf b/utils/channels/test-release/images/jalview_test-release_banner.xcf new file mode 100644 index 0000000..b7ea557 Binary files /dev/null and b/utils/channels/test-release/images/jalview_test-release_banner.xcf differ diff --git a/utils/channels/test-release/resources/channel_properties b/utils/channels/test-release/resources/channel_properties index 6351a8b..3ef86d3 100644 --- a/utils/channels/test-release/resources/channel_properties +++ b/utils/channels/test-release/resources/channel_properties @@ -1,5 +1,5 @@ app_name=Jalview Test -banner=/images/jalview_banner.png +banner=/images/jalview_test-release_banner.png logo.16=/images/jalview_logo-16.png logo.32=/images/jalview_logo-32.png logo.38=/images/jalview_logo-38.png diff --git a/utils/channels/test-release/resources/images/jalview_banner.png b/utils/channels/test-release/resources/images/jalview_banner.png deleted file mode 100644 index 0b67d19..0000000 Binary files a/utils/channels/test-release/resources/images/jalview_banner.png and /dev/null differ diff --git a/utils/channels/test-release/resources/images/jalview_test-release_banner.png b/utils/channels/test-release/resources/images/jalview_test-release_banner.png new file mode 100644 index 0000000..e4aed51 Binary files /dev/null and b/utils/channels/test-release/resources/images/jalview_test-release_banner.png differ