From: Dylan Lloyd Date: Thu, 16 Jun 2011 19:42:57 +0000 (-0400) Subject: Merge branch 'syntax-highlighting' into dev X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=7fb9127556aee383b43329807aceb29e62db0c01;hp=a0d20ebe94907b3400909c8c13ffa18423dc157e;p=dylansserver.git Merge branch 'syntax-highlighting' into dev --- diff --git a/404.php b/404.php index 1b17517..19e46aa 100644 --- a/404.php +++ b/404.php @@ -7,15 +7,54 @@ 404: not found + + + + + +
sorry
+ "font-size:20em;font-family:'MuseoSlab500';">sorry

- can't find that. maybe try + can't find that. maybe try here?
diff --git a/includes/style.css b/includes/style.css index 7f2e6cd..fd03cb3 100644 --- a/includes/style.css +++ b/includes/style.css @@ -27,7 +27,6 @@ h3 { margin-top:15px; - font-family:sans-serif; font-family:'MuseoSlab500'; } @@ -52,9 +51,6 @@ li { } #banner { -/* float:left; - margin-right:15px; -*/ margin-left:15px; } @@ -75,7 +71,7 @@ li { } #portfolio li{ - font-family:sans-serif; + font-family:'InconsolataMedium'; } #exhibit { @@ -103,7 +99,6 @@ li { #contact_me { margin-top:100px; - font-family:sans-serif; text-align:left; clear:both; } @@ -173,7 +168,6 @@ pre { #navigation { text-align:left; - font-family:sans-serif; } #comments { @@ -238,7 +232,6 @@ pre { #not_human { display:none; font-weight:bold; - font-family:sans-serif; color:red; margin-top:15px; margin-bottom:15px; @@ -247,7 +240,6 @@ pre { #blank_comment { display:none; font-weight:bold; - font-family:sans-serif; color:red; margin-top:15px; margin-bottom:15px;