Merge pull request #602 from numinit/css

CSS and Web Font fixes
This commit is contained in:
Jon Atkins 2013-10-10 05:16:21 -07:00
commit 4eb8757c45
2 changed files with 12 additions and 13 deletions

View File

@ -40,10 +40,10 @@ if(!d) {
if(document.getElementById('header_email')) { if(document.getElementById('header_email')) {
// however, we are logged in. // however, we are logged in.
setTimeout('location.reload();', 3*1000); setTimeout('location.reload();', 3*1000);
throw('Page doesnt 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 // FIXME: handle nia takedown in progress
throw('Couldnt retrieve player data. Are you logged in?'); throw("Couldn't retrieve player data. Are you logged in?");
} }
@ -63,7 +63,7 @@ document.getElementsByTagName('head')[0].innerHTML = ''
+ '<style>@@INCLUDESTRING:style.css@@</style>' + '<style>@@INCLUDESTRING:style.css@@</style>'
+ '<style>@@INCLUDESTRING:external/leaflet.css@@</style>' + '<style>@@INCLUDESTRING:external/leaflet.css@@</style>'
//note: smartphone.css injection moved into code/smartphone.js //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">'; + '<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 = '' document.getElementsByTagName('body')[0].innerHTML = ''
+ '<div id="map">Loading, please wait</div>' + '<div id="map">Loading, please wait</div>'

View File

@ -9,7 +9,7 @@ html, body, #map {
body { body {
font-size: 14px; font-size: 14px;
font-family: "roboto",arial,helvetica,sans-serif; font-family: "Roboto", "Helvetica Neue", Helvetica, sans-serif;
margin: 0; margin: 0;
} }
@ -136,7 +136,7 @@ a:hover {
.fieldmu { .fieldmu {
color: #FFCE00; color: #FFCE00;
font-size: 13px; 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-align: center;
text-shadow: 0 0 0.2em black, 0 0 0.2em black, 0 0 0.2em black; text-shadow: 0 0 0.2em black, 0 0 0.2em black, 0 0 0.2em black;
pointer-events: none; pointer-events: none;
@ -210,6 +210,7 @@ a:hover {
z-index: 3000; z-index: 3000;
background: rgba(8, 48, 78, 0.9); background: rgba(8, 48, 78, 0.9);
font-size: 12.6px; font-size: 12.6px;
line-height: 15px;
color: #eee; color: #eee;
border: 1px solid #20A8B1; border: 1px solid #20A8B1;
border-bottom: 0; border-bottom: 0;
@ -255,7 +256,6 @@ em {
} }
#chat td, #chatinput td { #chat td, #chatinput td {
font-family: Verdana, sans-serif;
font-size: 12.6px; font-size: 12.6px;
vertical-align: top; vertical-align: top;
padding-bottom: 3px; padding-bottom: 3px;
@ -302,7 +302,6 @@ mark {
summary { summary {
color: #bbb; color: #bbb;
display: inline-block; display: inline-block;
font-family: Verdana,sans-serif;
height: 16px; height: 16px;
overflow: hidden; overflow: hidden;
padding: 0 2px; padding: 0 2px;
@ -333,7 +332,6 @@ summary {
#chatinput input { #chatinput input {
background: transparent; background: transparent;
font-size: 12.6px; font-size: 12.6px;
font-family: Verdana,sans-serif;
color: #EEEEEE; color: #EEEEEE;
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -384,6 +382,7 @@ h2 {
} }
h2 #name { h2 #name {
font-weight: 300;
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -697,7 +696,6 @@ h3 {
right: 2px; right: 2px;
cursor: pointer; cursor: pointer;
color: #FFCE00; color: #FFCE00;
font-family: "Arial", sans;
font-size: 16px; font-size: 16px;
} }
@ -742,7 +740,8 @@ h3 {
background-color: rgba(8, 48, 78, 0.9); background-color: rgba(8, 48, 78, 0.9);
border: 1px solid #20A8B1; border: 1px solid #20A8B1;
color: #eee; color: #eee;
font: 13px/15px Roboto, Arial, Helvetica, sans-serif; font-size: 13px;
line-height: 15px;
padding: 2px 4px; padding: 2px 4px;
} }
@ -783,6 +782,8 @@ h3 {
} }
.ui-dialog-titlebar { .ui-dialog-titlebar {
font-size: 13px;
line-height: 15px;
text-align: center; text-align: center;
padding: 4px; padding: 4px;
background-color: rgba(8, 60, 78, 0.9); background-color: rgba(8, 60, 78, 0.9);
@ -892,7 +893,6 @@ td + td {
/* redeem results *****************************************************/ /* redeem results *****************************************************/
.redeem-result-table { .redeem-result-table {
font-size: 14px; font-size: 14px;
font-family: Roboto, Arial, Helvetica, sans-serif;
table-layout: fixed; table-layout: fixed;
} }
@ -949,7 +949,6 @@ td + td {
left:10px; left:10px;
z-index: 2500; z-index: 2500;
font-size:11px; font-size:11px;
font-family: "roboto",arial,helvetica,sans-serif;
background-color:#0E3C46; background-color:#0E3C46;
color:#ffce00; color:#ffce00;