From eb3e11068965f2bd9428e0d15147b8086e5ab026 Mon Sep 17 00:00:00 2001
From: raylu <raylu@mixpanel.com>
Date: Sun, 11 Sep 2011 03:36:52 -0700
Subject: new font: cantarell

also fix some css properties, reorder the header, and other minor fixes
---
 css/mapstyle.css    |  7 +++----
 css/pagestyle.css   |  4 ++--
 includes/header.php | 41 +++++++++++++++++++++--------------------
 includes/maps.php   |  4 ++--
 pages/admin.php     |  4 ++--
 5 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/css/mapstyle.css b/css/mapstyle.css
index ffec888..49d154c 100644
--- a/css/mapstyle.css
+++ b/css/mapstyle.css
@@ -28,8 +28,8 @@
 .dsp_33 {
 	width:32%;
 }
-.dsp_49 {
-	width:49%;
+.dsp_60 {
+	width:60%;
 }
 .dsp_24 {
 	width:23%;
@@ -41,7 +41,7 @@
 .grid_dsp_left,
 .grid_dsp_mid,
 .grid_dsp_right {
-	overflow: none;
+	overflow: hidden;
 	position:relative;
 	float: left;
 	padding:2px;
@@ -49,7 +49,6 @@
 }
 .grid_dsp_left {
 	text-align:left;
-	align:left;
 }
 .grid_dsp_mid {
 	text-align:center;
diff --git a/css/pagestyle.css b/css/pagestyle.css
index 8a834bb..6351a28 100644
--- a/css/pagestyle.css
+++ b/css/pagestyle.css
@@ -1,6 +1,6 @@
 body {
-	font-size: 12pt;
-	font-family: helvetica, sans-serif;
+	font-size: 16px;
+	font-family: cantarell, helvetica, sans-serif;
 	background-color: #121212;
 	color: #ffffff;
 
diff --git a/includes/header.php b/includes/header.php
index b386cfa..adfc211 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -3,28 +3,29 @@
 function htmlHeader() {
 ?>
 <!DOCTYPE html>
-<html xml:lang="en" lang="en"> 
-<head> 
-   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
-   <link href="css/mapstyle.css" rel="stylesheet" type="text/css" />
-   <link href="css/pagestyle.css" rel="stylesheet" type="text/css" />
-   <link href="css/statsstyle.css" rel="stylesheet" type="text/css" />
-   <title>pathery.com</title>
+<html xml:lang="en" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>pathery.com</title>
 
-   <script src="js/ajax.js" type="text/javascript"></script> 
-   <script src="js/mapspecs.js" type="text/javascript"></script> 
-	
-<script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-371072-3']);
-  _gaq.push(['_trackPageview']);
+    <link href="http://fonts.googleapis.com/css?family=Cantarell:400,400italic,700" rel="stylesheet" type="text/css">
+    <link href="css/mapstyle.css" rel="stylesheet" type="text/css" />
+    <link href="css/pagestyle.css" rel="stylesheet" type="text/css" />
+    <link href="css/statsstyle.css" rel="stylesheet" type="text/css" />
+    <script src="js/ajax.js" type="text/javascript"></script>
+    <script src="js/mapspecs.js" type="text/javascript"></script>
 
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
+    <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-371072-3']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+    </script>
 </head>
 <?
 }
diff --git a/includes/maps.php b/includes/maps.php
index 7be04eb..c01af22 100644
--- a/includes/maps.php
+++ b/includes/maps.php
@@ -152,9 +152,9 @@ function DisplayMap($mapMatrix, $idprefix = 1, $example = false, $speed = NULL)
 	//$date = date("m-d-y");
 
 	$output = "
-		<div id='$idprefix,outer' class='grid_outer' style='width:".($width+2)."px;height:".($height+50)."px;'>
+		<div id='$idprefix,outer' class='grid_outer' style='width:".($width+2)."px;height:".($height+60)."px;'>
 
-		<div class='grid_dsp_left dsp_49'>
+		<div class='grid_dsp_left dsp_60'>
 		<div id='$idprefix,dspID' title='MapID: $idprefix'> 
 		MapID: $idprefix
 		</div>
diff --git a/pages/admin.php b/pages/admin.php
index f06e1b4..b4e53be 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -179,9 +179,9 @@ function createThumbnail($mapMatrix, $idprefix, $width, $height) {
 	}
 	
    $output = "
-<div id='$idprefix,outer' class='grid_outer' style='width:".($width+30)."px;height:".($height+50)."px;'>
+<div id='$idprefix,outer' class='grid_outer' style='width:".($width+30)."px;height:".($height+60)."px;'>
 	
-	<div class='grid_dsp_left dsp_49'>
+	<div class='grid_dsp_left dsp_60'>
 		<div id='$idprefix,dspID' class='grid_dsp_data' title='MapID: $idprefix'> 
 			MapID: $idprefix
 		</div>
-- 
cgit v1.2.3

