disinclined.org / git / dylansserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: a0d20eb)
Merge branch 'syntax-highlighting' into dev
authorDylan Lloyd <dylan@psu.edu>
Thu, 16 Jun 2011 19:42:57 +0000 (15:42 -0400)
committerDylan Lloyd <dylan@psu.edu>
Thu, 16 Jun 2011 19:42:57 +0000 (15:42 -0400)
404.php patch | blob | history
includes/style.css patch | blob | history

diff --git a/404.php b/404.php
index 1b17517..19e46aa 100644 (file)
--- a/404.php
+++ b/404.php
@@ -7,15 +7,54 @@
   <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 
   <title>404: not found</title>
+    <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
+    <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
+     <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+    <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+    <style type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+      @font-face {
+          font-family: 'InconsolataMedium';
+          src: url('/font/inconsolata-webfont.eot');
+          src: url('/font/inconsolata-webfont.eot?#iefix') format('embedded-opentype'),
+               url('/font/inconsolata-webfont.woff') format('woff'),
+               url('/font/inconsolata-webfont.ttf') format('truetype'),
+               url('/font/inconsolata-webfont.svg#InconsolataMedium') format('svg');
+          font-weight: normal;
+          font-style: normal;
+      }
+      
+      @font-face {
+          font-family: 'MuseoSlab500';
+          src: url('/font/museo_slab_500-webfont.eot');
+          src: url('/font/museo_slab_500-webfont.eot?#iefix') format('embedded-opentype'),
+               url('/font/museo_slab_500-webfont.woff') format('woff'),
+               url('/font/museo_slab_500-webfont.ttf') format('truetype'),
+               url('/font/museo_slab_500-webfont.svg#MuseoSlab500') format('svg');
+          font-weight: normal;
+          font-style: normal;
+      }
+    </style>
+    <script type='text/javascript'>
+       function highlight() {
+         SyntaxHighlighter.autoloader(
+          'js /includes/syntax/scripts/shBrushJScript.js',
+          'bash /includes/syntax/scripts/shBrushBash.js',
+          'sql /includes/syntax/scripts/shBrushSql.js',
+          'cpp /includes/syntax/scripts/shBrushCpp.js');
+         SyntaxHighlighter.defaults['gutter'] = false;
+         SyntaxHighlighter.defaults['toolbar'] = false;
+         SyntaxHighlighter.all();
+       }
+    </script>
 </head>
 
 <body>
   <div style=
   "margin-left:15px;text-align:center;font-family:sans-serif;">
     <span style=
-    "font-size:20em;font-family:sans-serif;">sorry</span><br>
+    "font-size:20em;font-family:'MuseoSlab500';">sorry</span><br>
     <br>
-    <span style="font-size:3em;">can't find that. maybe try
+    <span style="font-size:3em;font-family:'InconsolataMedium'">can't find that. maybe try
     <a href="http://dylanstestserver.com">here</a>?</span><br>
   </div>
 </body>
diff --git a/includes/style.css b/includes/style.css
index 7f2e6cd..fd03cb3 100644 (file)
--- 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;
my (old) website