X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=includes%2Fstyle.css;h=fd03cb30a6fe058d060e113884b386a46b8818c1;hb=7fb9127556aee383b43329807aceb29e62db0c01;hp=572de5d6a4f6d669229bedcc5ea50591f01d14ac;hpb=79d2778faf3a23e282c0963c8d04bdd41c3eac2b;p=dylansserver.git

diff --git a/includes/style.css b/includes/style.css
index 572de5d..fd03cb3 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -1,3 +1,25 @@
+@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;
+}
+
 * {
 	padding: 0;
 	margin: 0;
@@ -5,12 +27,12 @@
 
 h3 {
 	margin-top:15px;
-	font-family:sans-serif;
+    font-family:'MuseoSlab500';
 }
 
 h1, h2 {
-    font-family:sans-serif;
     font-size:150%;
+    font-family:'MuseoSlab500';
 }
 
 a {
@@ -29,9 +51,6 @@ li {
 }
 
 #banner {
-/*	float:left;
-	margin-right:15px;
-*/
     margin-left:15px;
 }
 
@@ -52,12 +71,13 @@ li {
 }
 
 #portfolio li{
-	font-family:sans-serif;
+    font-family:'InconsolataMedium';
 }
 
 #exhibit {
 	float:right;
 	margin-left:17px;
+    font-family:'InconsolataMedium';
 }
 
 #exhibit h1 {
@@ -79,70 +99,42 @@ li {
 
 #contact_me {
 	margin-top:100px;
-	font-family:sans-serif;
 	text-align:left;
 	clear:both;
 }
 
-/* reprap */
-#reprap_entry {
-	font: 1.5em georgia, times;
-	text-decoration: none;
-	display: block;
-}
-
-/* peepshow */
-#peepshow_ {
-	font-style:italic;
-}
-#peepshow_title_1 {
-	font-style:italic;
-	margin-top:0px;
-}
-
-#peephow_title_2 {
-	font-size:3em;
-}
-
-#peepshow_entry {
-	font:1.4em;
-}
-
-#peepshow_entry {
-	font:1.4em;
-}
-
 /* drawcss */
 #drawcss_title {
-	font:1.6em;
+	font-size:1.6em;
 }
 
 #drawcss_entry {
-	font:1.6em;
+	font-size:1.6em;
  }
 
 /* youtube_backup */
 #youtube_backup_title {
-	font:1.6em;
+	font-size:1.6em;
 }
 
 #youtube_backup_entry {
-	font:1.4em;
+	font-size:1.4em;
 }
 
 /* i_like_pandora */
 #i_like_pandora_title {
-	font:1.6em;
+	font-size:1.6em;
 }
 
 #i_like_pandora_entry {
-	font:1.4em;
+	font-size:1.4em;
 }
 
 /* notes */
 #notes, #note {
 	text-align:left;
 	margin-top:20px;
+    font-family:'InconsolataMedium';
 }
 
 #notes h1 {
@@ -160,6 +152,7 @@ li {
 
 .note {
 	margin-bottom:40px;
+    font-family:'InconsolataMedium';
 }
 
 p {
@@ -169,11 +162,12 @@ p {
 pre {
 	margin-top:20px;
 	margin-bottom:20px;
+    width:100%;
+    overflow:auto;
 }
 
 #navigation {
 	text-align:left;
-	font-family:sans-serif;
 }
 
 #comments {
@@ -195,10 +189,12 @@ pre {
 
 #comment input {
 	border:1px solid grey;
+    font-family:'InconsolataMedium';
 }
 
 #comment textarea {
 	border:1px solid grey;
+    font-family:'InconsolataMedium';
 }
 
 #comment .submit {
@@ -229,21 +225,21 @@ pre {
 }
 
 .recaptcha_help {
+    font-family:'MuseoSlab500';
     font-size:80%;
 }
 
 #not_human {
     display:none;
     font-weight:bold;
-    font-family:sans-serif;
     color:red;
     margin-top:15px;
     margin-bottom:15px;
 }
 
-#blank_comment { display:none;
+#blank_comment {
+    display:none;
     font-weight:bold;
-    font-family:sans-serif;
     color:red;
     margin-top:15px;
     margin-bottom:15px;