commit 6216393a2f09dff6a74ae9eae2b2e9496cbd0e21 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Apr 20 10:33:55 2015 -0400

Update the Tor Messenger logo for Tor Launcher --- projects/tor-launcher/build | 5 ++++- projects/tor-launcher/config | 3 ++- projects/tor-launcher/logo.patch | 13 +++++++++++++ projects/tor-launcher/messenger.png | Bin 0 -> 7749 bytes projects/tor-launcher/torbirdy-logo.patch | 13 ------------- 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index a3c5f48..66909f9 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -8,7 +8,10 @@ patch -p1 < ../controlport.patch [% END -%] [% IF c("var/tor-mail") -%] cp ../torbirdy.png src/chrome/skin/tbb-logo.png -patch -p1 < ../torbirdy-logo.patch [% END -%] +[% IF c("var/tor-messenger") -%] +cp ../messenger.png src/chrome/skin/tbb-logo.png +[% END -%] +patch -p1 < ../logo.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index baceb0d..3e8c704 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -7,7 +7,8 @@ tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: torbirdy.png - - filename: torbirdy-logo.patch + - filename: messenger.png + - filename: logo.patch - filename: topdir.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch new file mode 100644 index 0000000..0e5daa1 --- /dev/null +++ b/projects/tor-launcher/logo.patch @@ -0,0 +1,13 @@ +diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css +index 331ae42..3331854 100644 +--- a/src/chrome/skin/network-settings.css ++++ b/src/chrome/skin/network-settings.css +@@ -90,7 +90,7 @@ button.firstAnswer { + .tbb-logo { + list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); + width: 115px; +- height: 80px; ++ height: 94px; + margin-right: 20px; + } + diff --git a/projects/tor-launcher/messenger.png b/projects/tor-launcher/messenger.png new file mode 100644 index 0000000..0b4d39c Binary files /dev/null and b/projects/tor-launcher/messenger.png differ diff --git a/projects/tor-launcher/torbirdy-logo.patch b/projects/tor-launcher/torbirdy-logo.patch deleted file mode 100644 index 0e5daa1..0000000 --- a/projects/tor-launcher/torbirdy-logo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css -index 331ae42..3331854 100644 ---- a/src/chrome/skin/network-settings.css -+++ b/src/chrome/skin/network-settings.css -@@ -90,7 +90,7 @@ button.firstAnswer { - .tbb-logo { - list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); - width: 115px; -- height: 80px; -+ height: 94px; - margin-right: 20px; - } -