[tor-commits] [tor-messenger-build/master] Patch for adding TorBirdy's logo to Tor Launcher

[sukhbir at torproject.org]

commit 78ac3163ddea34b1f652d183d31ee8d9f50704fd
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Mar 23 10:17:04 2015 +0530

    Patch for adding TorBirdy's logo to Tor Launcher
---
 projects/tor-launcher/build               |    4 ++++
 projects/tor-launcher/config              |    2 ++
 projects/tor-launcher/torbirdy-logo.patch |   13 +++++++++++++
 projects/tor-launcher/torbirdy.png        |  Bin 0 -> 15844 bytes
 4 files changed, 19 insertions(+)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 0891389..4da21ee 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -5,5 +5,9 @@ cd [% project %]-[% c('version') %]
 [% IF c("var/tor_control_port") -%]
 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 -%]
 make package
 mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index cd157fb..7611a1d 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -6,6 +6,8 @@ gpg_keyring: mikeperry.gpg
 tag_gpg_id: 1
 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"
 input_files:
+  - filename: torbirdy.png
+  - filename: torbirdy-logo.patch
   - filename: controlport.patch
     content: '[% INCLUDE controlport.patch.tmpl -%]'
     refresh_input: 1
diff --git a/projects/tor-launcher/torbirdy-logo.patch b/projects/tor-launcher/torbirdy-logo.patch
new file mode 100644
index 0000000..0e5daa1
--- /dev/null
+++ b/projects/tor-launcher/torbirdy-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/torbirdy.png b/projects/tor-launcher/torbirdy.png
new file mode 100644
index 0000000..6fecc45
Binary files /dev/null and b/projects/tor-launcher/torbirdy.png differ