From: Dylan Lloyd <dylan@psu.edu>
Date: Sat, 22 Jan 2011 05:02:24 +0000 (-0500)
Subject: Merge branch 'dev' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=e521004c05ff937ac56a77069a3eba3e7d2b9550;hp=de846efb728bbf7b0aeae8a50219a55a321ed440;p=dylansserver.git

Merge branch 'dev' into live
---

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..6f9af41
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1 @@
+ErrorDocument 404 404.php
diff --git a/404.php b/404.php
new file mode 100644
index 0000000..9700c80
--- /dev/null
+++ b/404.php
@@ -0,0 +1,3 @@
+<div style="margin-left:15px;text-align:center;font-family:sans-serif;"><span style="font-size:20em;font-family:sans-serif;">sorry</span><br><br>
+<span style="font-size:3em;">can't find that. maybe try <a href="http://dylanstestserver.com">here</a>?</span><br>
+</div>
diff --git a/includes/style.css b/includes/style.css
index e32ec5b..084bec1 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -44,6 +44,10 @@ li {
 	margin-right:17px;
 }
 
+#portfolio li{
+	font-family:sans-serif;
+}
+
 #exhibit {
 	float:right;
 }