commit ab0b6da5e0d9757e199d37d7f155fc93224c22c5 Author: Karsten Loesing karsten.loesing@gmx.net Date: Sat Sep 26 16:07:39 2015 +0200

Include Leiah's awesome logo and wordmark.

Implements #16592. --- src/org/torproject/exonerator/ExoneraTorServlet.java | 9 ++++++++- web/css/exonerator.css | 4 ++++ web/images/exonerator-logo.png | Bin 0 -> 70763 bytes web/images/exonerator-wordmark.png | Bin 0 -> 14543 bytes web/images/top-left.png | Bin 11137 -> 0 bytes web/images/top-middle.png | Bin 240 -> 0 bytes web/images/top-right.png | Bin 607 -> 0 bytes 7 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index a0c798f..eb069b1 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -529,7 +529,14 @@ public class ExoneraTorServlet extends HttpServlet { + " <div class="row">\n" + " <div class="col-xs-12">\n" + " <div class="page-header">\n" - + " <h1><a href="/">ExoneraTor</a></h1>\n" + + " <h1>\n" + + " <div class="text-center">\n" + + " <img src="images/exonerator-logo.png" " + + "width="334" height="252" alt="ExoneraTor logo">" + + "<img src="images/exonerator-wordmark.png" width="428" " + + "height="63" alt="ExoneraTor wordmark">\n" + + " </div><!-- text-center -->\n" + + " </h1>\n" + " </div><!-- page-header -->\n" + " </div><!-- col -->\n" + " </div><!-- row -->\n"); diff --git a/web/css/exonerator.css b/web/css/exonerator.css index cfd1d85..a94fd54 100644 --- a/web/css/exonerator.css +++ b/web/css/exonerator.css @@ -29,3 +29,7 @@ pre { white-space: pre-wrap; }

+img { + vertical-align: text-bottom; +} + diff --git a/web/images/exonerator-logo.png b/web/images/exonerator-logo.png new file mode 100644 index 0000000..3a31110 Binary files /dev/null and b/web/images/exonerator-logo.png differ diff --git a/web/images/exonerator-wordmark.png b/web/images/exonerator-wordmark.png new file mode 100644 index 0000000..eaa93fc Binary files /dev/null and b/web/images/exonerator-wordmark.png differ diff --git a/web/images/top-left.png b/web/images/top-left.png deleted file mode 100644 index 9927355..0000000 Binary files a/web/images/top-left.png and /dev/null differ diff --git a/web/images/top-middle.png b/web/images/top-middle.png deleted file mode 100644 index 1035dc5..0000000 Binary files a/web/images/top-middle.png and /dev/null differ diff --git a/web/images/top-right.png b/web/images/top-right.png deleted file mode 100644 index 54623ef..0000000 Binary files a/web/images/top-right.png and /dev/null differ