[tor-commits] [metrics-web/master] Start using new Tor Metrics logo in the banner.

[karsten@xxxxxxxxxxxxxx]

commit 99375e149978881c0012d1f8fba5c0290fff1a0a
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Wed Sep 13 15:11:45 2017 +0200

    Start using new Tor Metrics logo in the banner.
    
    The new logo was put together by antonela, and the style changes come
    from Raphael Bergmann. Thanks a lot!
    
    Implements part of #23383 (without updating *tile.png files).
---
 website/src/main/resources/web/WEB-INF/top.jsp      |   5 ++---
 website/src/main/resources/web/css/style.css        |  20 ++++++--------------
 .../src/main/resources/web/images/metrics-logo.png  | Bin 41165 -> 0 bytes
 .../resources/web/images/metrics-wordmark-white.png | Bin 12343 -> 0 bytes
 .../main/resources/web/images/tor-metrics-white.png | Bin 0 -> 4700 bytes
 .../resources/web/images/tor-metrics-white@xxxxxx   | Bin 0 -> 10874 bytes
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/website/src/main/resources/web/WEB-INF/top.jsp b/website/src/main/resources/web/WEB-INF/top.jsp
index 86ac85f..c013780 100644
--- a/website/src/main/resources/web/WEB-INF/top.jsp
+++ b/website/src/main/resources/web/WEB-INF/top.jsp
@@ -69,7 +69,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </label>
-      <a class="navbar-brand visible-xs" href="/"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics"></a>
+      <a class="navbar-brand visible-xs" href="/"><img src="images/tor-metrics-white.png" width="232" height="50" alt="Tor Metrics"></a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -102,8 +102,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c
 
 <!-- page header for every single page -->
 <div class="page-header hidden-xs">
-  <a href="/"><img src="images/metrics-logo.png" width="102" height="133" alt="" id="metrics-logo"></a>
-  <a href="/"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics" id="metrics-wordmark"></a>
+  <a href="/"><img src="images/tor-metrics-white@xxxxxx" width="232" height="50" alt="Tor Metrics" id="metrics-wordmark"></a>
   <div>
     <p>
       <i>&ldquo;Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective.&rdquo;<br><small>&mdash; Bruce Schneier (June 1, 2016)</small></i>
diff --git a/website/src/main/resources/web/css/style.css b/website/src/main/resources/web/css/style.css
index 6d39105..6770c84 100644
--- a/website/src/main/resources/web/css/style.css
+++ b/website/src/main/resources/web/css/style.css
@@ -33,10 +33,6 @@ body #wrapper {
     max-width:40%;
     height:auto;
 }
-.page-header img#metrics-wordmark {
-    position:relative;
-    top:-3px;
-}
 .page-header div {
     text-align:right;
     position:absolute;
@@ -67,7 +63,7 @@ body #wrapper {
         display:none;
     }
 }
-@media (max-height:800px) {
+@media (max-height:799.99999px) {
     /* make page header smaller on e.g. 10 inch notebooks etc. */
     .page-header {
         padding: 0em 2.0em 2.0em 2.0em;
@@ -89,6 +85,11 @@ body #wrapper {
         margin-bottom: 0px !important;
     }
 }
+@media (min-height:800px) and (min-width: 768px) {
+    .page-header {
+        padding-top:70px;
+    }
+}
 @media (max-height:800px) and (max-width: 1199.99999px) {
     .page-header div {
         max-width:330px;
@@ -238,15 +239,6 @@ blockquote:before {
 
 
 /* logo size */
-.navbar-header {
-    background-image: url(../images/metrics-logo.png);
-    background-position:left center;
-    background-repeat:no-repeat;
-    background-size:contain;
-}
-.navbar-brand {
-    padding-left:50px;
-}
 .navbar-brand img {
     height:20px;
     width:auto;
diff --git a/website/src/main/resources/web/images/metrics-logo.png b/website/src/main/resources/web/images/metrics-logo.png
deleted file mode 100644
index 7f236d6..0000000
Binary files a/website/src/main/resources/web/images/metrics-logo.png and /dev/null differ
diff --git a/website/src/main/resources/web/images/metrics-wordmark-white.png b/website/src/main/resources/web/images/metrics-wordmark-white.png
deleted file mode 100644
index f5d98f2..0000000
Binary files a/website/src/main/resources/web/images/metrics-wordmark-white.png and /dev/null differ
diff --git a/website/src/main/resources/web/images/tor-metrics-white.png b/website/src/main/resources/web/images/tor-metrics-white.png
new file mode 100644
index 0000000..9140ec1
Binary files /dev/null and b/website/src/main/resources/web/images/tor-metrics-white.png differ
diff --git a/website/src/main/resources/web/images/tor-metrics-white@xxxxxx b/website/src/main/resources/web/images/tor-metrics-white@xxxxxx
new file mode 100644
index 0000000..073337a
Binary files /dev/null and b/website/src/main/resources/web/images/tor-metrics-white@xxxxxx differ



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits