Edits to header and footer

tovanor · Jul 16, 2011 · 5282391 · 5282391
1 parent 5f95c30
commit 5282391
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/inc/footer.inc.php b/inc/footer.inc.php
@@ -1,7 +1,7 @@
-	</div>
-	<div id="footer">
-		<br />This is the footer!
-	</div>
+		<div id="footer">
+			&copy;2011 Ningterns - 
+			<a href="about.php">About Us</a>	
+		</div>
 
 </div>
 

diff --git a/inc/header.inc.php b/inc/header.inc.php
@@ -1,6 +1,8 @@
 <?php 
 require_once("config.inc.php"); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="https://www.facebook.com/2008/fbml">
+
 
 <head>
 	<title>Pictionary - <?php echo $title; ?></title>
@@ -11,7 +13,6 @@
 
 <body>
 <div id="header">
-  <img class="logo" />
-  <p>This is the header!</p><br />
+  <a href="index.php"><img class="logo" src="images/logo.png" alt="comiCrazy"/></a>
 </div>
 <div class="main container_12">
diff --git a/inc/meta.inc.php b/inc/meta.inc.php
@@ -1,7 +1,8 @@
-<script src="js/jquery-1.6.1.min.js"></script>
+<script src="js/jquery-1.6.2.min.js"></script>
+<script src="js/jquery.autocomplete.min.js"></script>
 
 <link rel="stylesheet" href="style/reset.css" />
 <link rel="stylesheet" href="style/text.css" />
 <link rel="stylesheet" href="style/960.css" />
 <link rel="stylesheet" href="style/screen.css" />
-<link href='http://fonts.googleapis.com/css?family=Indie+Flower|Varela+Round&v2' rel='stylesheet' type='text/css'>
+<link href='http://fonts.googleapis.com/css?family=Indie+Flower|Varela+Round&v2' rel='stylesheet' type='text/css'/>
diff --git a/style/screen.css b/style/screen.css
@@ -1,12 +1,18 @@
+#header {
+	display:block;
+	width:640px;
+	text-align:center;
+	margin:0px auto 10px auto;
+}
 
-header {
-	padding-top: 10px;
-	padding-bottom: 5px;
-	margin-bottom: 10px;
-	background-color: #99CCFF;
+#header .logo {
+    display:inline;
+    text-align:center;
+    margin:0px auto 15px auto;
+    width:400px;
 }
 
-footer {
+#footer {
 	margin-bottom: 10px;
 }
 
@@ -99,3 +105,4 @@ textarea {
     text-align: center;
     padding-top: 18px;
 }
+