From 306de7e6dc47d461670550f78c45ceac7306ffc1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <mjones@rice.edu>
Date: Mon, 7 Oct 2013 18:29:43 -0500
Subject: [PATCH 1/5] Load different versions of Roboto web font Use Roboto for
 COMM font rather than Verdana

---
 main.js   |  8 +++++---
 style.css | 12 +++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/main.js b/main.js
index a651f80f..ff0fb77f 100644
--- a/main.js
+++ b/main.js
@@ -40,10 +40,10 @@ if(!d) {
   if(document.getElementById('header_email')) {
     // however, we are logged in.
     setTimeout('location.reload();', 3*1000);
-    throw('Page doesn’t have player data, but you are logged in. Reloading in 3s.');
+    throw("Page doesn't have player data, but you are logged in. Reloading in 3s.");
   }
   // FIXME: handle nia takedown in progress
-  throw('Couldn’t retrieve player data. Are you logged in?');
+  throw("Couldn't retrieve player data. Are you logged in?");
 }
 
 
@@ -63,7 +63,9 @@ document.getElementsByTagName('head')[0].innerHTML = ''
   + '<style>@@INCLUDESTRING:style.css@@</style>'
   + '<style>@@INCLUDESTRING:external/leaflet.css@@</style>'
 //note: smartphone.css injection moved into code/smartphone.js
-  + '<link href="//fonts.googleapis.com/css?family=Roboto:normal,bold&subset=latin,cyrillic-ext,greek-ext,greek,cyrillic,latin-ext,vietnamese" rel="stylesheet" type="text/css">';
+  + '<script type="text/javascript" src="//apis.google.com/js/api.js"/>'
+  + '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Coda"/>'
+  + '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic"/>';
 
 document.getElementsByTagName('body')[0].innerHTML = ''
   + '<div id="map">Loading, please wait</div>'
diff --git a/style.css b/style.css
index 377d6577..f70714a2 100644
--- a/style.css
+++ b/style.css
@@ -9,11 +9,12 @@ html, body, #map {
 
 body {
   font-size: 14px;
-  font-family: "roboto",arial,helvetica,sans-serif;
+  font-family: "Roboto",arial,helvetica,sans-serif;
   margin: 0;
 }
 
 #scrollwrapper {
+  font-family: Coda, sans-serif;
   overflow-x: hidden;
   overflow-y: auto;
   position: fixed;
@@ -255,7 +256,7 @@ em {
 }
 
 #chat td, #chatinput td {
-  font-family: Verdana, sans-serif;
+  font-family: Roboto, sans-serif;
   font-size: 12.6px;
   vertical-align: top;
   padding-bottom: 3px;
@@ -302,7 +303,7 @@ mark {
 summary {
   color: #bbb;
   display: inline-block;
-  font-family: Verdana,sans-serif;
+  font-family: Roboto,sans-serif;
   height: 16px;
   overflow: hidden;
   padding: 0 2px;
@@ -333,7 +334,7 @@ summary {
 #chatinput input {
   background: transparent;
   font-size: 12.6px;
-  font-family: Verdana,sans-serif;
+  font-family: Roboto,sans-serif;
   color: #EEEEEE;
   width: 100%;
   height: 100%;
@@ -697,7 +698,7 @@ h3 {
   right: 2px;
   cursor: pointer;
   color: #FFCE00;
-  font-family: "Arial", sans;
+  font-family: Roboto, sans-serif;
   font-size: 16px;
 }
 
@@ -783,6 +784,7 @@ h3 {
 }
 
 .ui-dialog-titlebar {
+  font: 13px/15px Roboto, Arial, Helvetica, sans-serif;
   text-align: center;
   padding: 4px;
   background-color: rgba(8, 60, 78, 0.9);

From 0fde4e6ba4de6a6ac02bff070288dea23e7d34e8 Mon Sep 17 00:00:00 2001
From: Morgan Jones <mjones@rice.edu>
Date: Tue, 8 Oct 2013 15:40:07 -0500
Subject: [PATCH 2/5] Remove api.js

---
 main.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main.js b/main.js
index ff0fb77f..80ec3b57 100644
--- a/main.js
+++ b/main.js
@@ -63,7 +63,6 @@ document.getElementsByTagName('head')[0].innerHTML = ''
   + '<style>@@INCLUDESTRING:style.css@@</style>'
   + '<style>@@INCLUDESTRING:external/leaflet.css@@</style>'
 //note: smartphone.css injection moved into code/smartphone.js
-  + '<script type="text/javascript" src="//apis.google.com/js/api.js"/>'
   + '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Coda"/>'
   + '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic"/>';
 

From e3002d420e27c1b310e30123979e8eff1ccb22a4 Mon Sep 17 00:00:00 2001
From: Morgan Jones <mjones@rice.edu>
Date: Wed, 9 Oct 2013 08:27:20 -0500
Subject: [PATCH 3/5] * Remove Coda font * Add more variants of Roboto for
 future typography tweaks * Tweak sidebar player name to look more attractive
 * Simplify font selectors

---
 main.js   |  3 +--
 style.css | 21 +++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/main.js b/main.js
index 80ec3b57..d231360a 100644
--- a/main.js
+++ b/main.js
@@ -63,8 +63,7 @@ document.getElementsByTagName('head')[0].innerHTML = ''
   + '<style>@@INCLUDESTRING:style.css@@</style>'
   + '<style>@@INCLUDESTRING:external/leaflet.css@@</style>'
 //note: smartphone.css injection moved into code/smartphone.js
-  + '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Coda"/>'
-  + '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic"/>';
+  + '<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:100,100italic,300,300italic,400,400italic,500,500italic,700,700italic&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic"/>';
 
 document.getElementsByTagName('body')[0].innerHTML = ''
   + '<div id="map">Loading, please wait</div>'
diff --git a/style.css b/style.css
index f70714a2..7b286c73 100644
--- a/style.css
+++ b/style.css
@@ -9,12 +9,11 @@ html, body, #map {
 
 body {
   font-size: 14px;
-  font-family: "Roboto",arial,helvetica,sans-serif;
+  font-family: "Roboto", "Helvetica Neue", Helvetica, sans-serif;
   margin: 0;
 }
 
 #scrollwrapper {
-  font-family: Coda, sans-serif;
   overflow-x: hidden;
   overflow-y: auto;
   position: fixed;
@@ -137,7 +136,7 @@ a:hover {
 .fieldmu {
   color: #FFCE00;
   font-size: 13px;
-  font-family: "roboto",arial,helvetica,sans-serif; /*override leaflet-container */
+  font-family: Roboto, "Helvetica Neue", Helvetica, sans-serif; /*override leaflet-container */
   text-align: center;
   text-shadow: 0 0 0.2em black, 0 0 0.2em black, 0 0 0.2em black;
   pointer-events: none;
@@ -211,6 +210,7 @@ a:hover {
   z-index: 3000;
   background: rgba(8, 48, 78, 0.9);
   font-size: 12.6px;
+  line-height: 14px;
   color: #eee;
   border: 1px solid #20A8B1;
   border-bottom: 0;
@@ -256,7 +256,6 @@ em {
 }
 
 #chat td, #chatinput td {
-  font-family: Roboto, sans-serif;
   font-size: 12.6px;
   vertical-align: top;
   padding-bottom: 3px;
@@ -303,7 +302,6 @@ mark {
 summary {
   color: #bbb;
   display: inline-block;
-  font-family: Roboto,sans-serif;
   height: 16px;
   overflow: hidden;
   padding: 0 2px;
@@ -334,7 +332,6 @@ summary {
 #chatinput input {
   background: transparent;
   font-size: 12.6px;
-  font-family: Roboto,sans-serif;
   color: #EEEEEE;
   width: 100%;
   height: 100%;
@@ -385,6 +382,7 @@ h2 {
 }
 
 h2 #name {
+  font-weight: 300;
   display: inline-block;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -698,7 +696,6 @@ h3 {
   right: 2px;
   cursor: pointer;
   color: #FFCE00;
-  font-family: Roboto, sans-serif;
   font-size: 16px;
 }
 
@@ -743,7 +740,8 @@ h3 {
   background-color: rgba(8, 48, 78, 0.9);
   border: 1px solid #20A8B1;
   color: #eee;
-  font: 13px/15px Roboto, Arial, Helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 15px;
   padding: 2px 4px;
 }
 
@@ -784,7 +782,8 @@ h3 {
 }
 
 .ui-dialog-titlebar {
-  font: 13px/15px Roboto, Arial, Helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 15px;
   text-align: center;
   padding: 4px;
   background-color: rgba(8, 60, 78, 0.9);
@@ -894,7 +893,6 @@ td + td {
 /* redeem results *****************************************************/
 .redeem-result-table {
   font-size: 14px;
-  font-family: Roboto, Arial, Helvetica, sans-serif;
   table-layout: fixed;
 }
 
@@ -945,13 +943,12 @@ td + td {
   color: #28f428;
 }
 
-#portal_highlight_select{
+#portal_highlight_select {
   position: absolute;
   top:5px;
   left:10px;
   z-index: 2500;
   font-size:11px;
-  font-family: "roboto",arial,helvetica,sans-serif;
   background-color:#0E3C46;
   color:#ffce00;
   

From c92aaf604d299bd3946ba89e016d87864abc5d6f Mon Sep 17 00:00:00 2001
From: Morgan Jones <mjones@rice.edu>
Date: Wed, 9 Oct 2013 08:36:12 -0500
Subject: [PATCH 4/5] Slight fixup

---
 style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style.css b/style.css
index 7b286c73..9df26a17 100644
--- a/style.css
+++ b/style.css
@@ -210,7 +210,7 @@ a:hover {
   z-index: 3000;
   background: rgba(8, 48, 78, 0.9);
   font-size: 12.6px;
-  line-height: 14px;
+  line-height: 14.8px;
   color: #eee;
   border: 1px solid #20A8B1;
   border-bottom: 0;

From 301a8564afc86524ebfb854e6ef662e2069f821b Mon Sep 17 00:00:00 2001
From: Morgan Jones <mjones@rice.edu>
Date: Wed, 9 Oct 2013 15:54:49 -0500
Subject: [PATCH 5/5] Increase spacing slightly more in chat

---
 style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style.css b/style.css
index 9df26a17..3b886151 100644
--- a/style.css
+++ b/style.css
@@ -210,7 +210,7 @@ a:hover {
   z-index: 3000;
   background: rgba(8, 48, 78, 0.9);
   font-size: 12.6px;
-  line-height: 14.8px;
+  line-height: 15px;
   color: #eee;
   border: 1px solid #20A8B1;
   border-bottom: 0;