X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=includes%2Fstyle.css;h=c8d23092b7c2568f8de07213df18d1c85f4445d8;hb=0127bff31f49e168b6739746ed9dfbd6455c0833;hp=102c82c08205434845b4716f09f1f3d1b7fa30ce;hpb=0d5b65dd317eda7cd09d208c634067c4a9acb6fd;p=dylansserver.git

diff --git a/includes/style.css b/includes/style.css
index 102c82c..c8d2309 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -1,173 +1,209 @@
+@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;
-	}
+margin:0;
+padding:0;
+}
+
+body {
+background-image: url('../images/gray_jean.png');
+margin-bottom: 15px;
+}
 
 h3 {
-	margin-top:15px;
+margin-top:15px;
+font-family:MuseoSlab500;
+}
+
+h1,h2 {
+font-size:150%;
+font-family:MuseoSlab500;
 }
 
 a {
-	text-decoration:none;
+text-decoration:none;
 }
 
 li {
-	list-style:none;
-	display:block;
+list-style:none;
+display:block;
 }
 
 #structure {
-	width:960px;
-	margin: 0 auto;
-	margin-top: 30px;
+width:960px;
+margin:30px auto 0;
 }
 
 #banner {
-	float:right;
-	margin-right:15px;
+margin-left:15px;
 }
 
 #content {
-	float:right;
-	width:725px;
-	min-height:300px;
-	margin-bottom: 20px;
-	margin-right:15px;
-	padding:5px;
-	padding-left:20px;
-	padding-bottom:25px;
+width:725px;
+min-height:300px;
+margin-bottom:20px;
+margin-right:15px;
+text-align:left;
+padding:5px 5px 25px 20px;
 }
 
 #portfolio {
-	float:right;
-	width:350px;
-	margin-right:17px;
+float:left;
+width:350px;
 }
 
-#portfolio li{
-	font-family:sans-serif;
+#portfolio li {
+font-family:InconsolataMedium;
 }
 
 #exhibit {
-	float:right;
+float:right;
+margin-left:17px;
+font-family:InconsolataMedium;
 }
 
 #exhibit h1 {
-	margin-bottom:15px;
+margin-bottom:15px;
 }
 
 .exhibit {
-	width:300px;
-	min-height:600px;
-	border:1px solid black;
-	padding:10px;
-	display:none;
+width:300px;
+min-height:475px;
+border:1px solid #000;
+display:none;
+text-align:left;
+padding:10px;
 }
 
 .shownDiv {
-	border:1px solid black;
+border:1px solid #000;
 }
 
 #contact_me {
-	margin-top:100px;
-<<<<<<< HEAD
-	font-family:sans-serif;
-=======
->>>>>>> no-javascript
+margin-top:100px;
+text-align:left;
+clear:both;
 }
 
-/* reprap */
-#reprap_entry {
-	font: 1.5em georgia, times;
-	text-decoration: none;
-	display: block;
+#notes,#note {
+text-align:left;
+margin-top:40px;
+font-family:InconsolataMedium;
 }
 
-/* peepshow */
-#peepshow_ {
-	font-style:italic;
-}
-#peepshow_title_1 {
-	font-style:italic;
-	margin-top:0px;
+#notes h1 {
+margin-bottom:10px;
 }
 
-#peephow_title_2 {
-	font-size:3em;
-<<<<<<< HEAD
+.date {
+color:grey;
 }
 
-#peepshow_entry {
-	font:1.4em "lucida console";
+#comment_link {
+font-size:80%;
 }
 
-=======
+.note {
+margin-bottom:40px;
+font-family:InconsolataMedium;
 }
 
-#peepshow_entry {
-	font:1.4em "lucida console";
+p {
+margin-top:15px;
 }
 
->>>>>>> no-javascript
-/* readoo */
-#readoo_title {
-	font:1.6em arial;
+pre {
+margin-top:20px;
+margin-bottom:20px;
+width:100%;
+overflow:auto;
 }
 
-#readoo_entry {
-	font:1.6em arial;
+#navigation {
+text-align:left;
 }
 
-/* drawcss */
-#drawcss_title {
-	font:1.6em "lucida console";
+#comments {
+margin-top:30px;
+border-left:1px solid #000;
+padding-left:15px;
 }
 
-#drawcss_entry {
-	font:1.6em "lucida console";
- }
+.comment {
+margin-bottom:30px;
+}
 
-/* youtube_backup */
-#youtube_backup_title {
-	font:1.6em "lucida console";
+#comment {
+padding-left:15px;
+border-left:1px solid #000;
+margin-top:15px;
+text-align:left;
 }
 
-#youtube_backup_entry {
-	font:1.4em "lucida console";
+#comment .submit {
+border:none;
+color:blue;
+cursor:pointer;
+font-size:120%;
+font-weight:700;
+margin-top:20px;
 }
 
-/* i_like_pandora */
-#i_like_pandora_title {
-	font:1.6em "lucida console";
+#recaptcha_widget {
+position:relative;
+display:none;
 }
 
-#i_like_pandora_entry {
-	font:1.4em "lucida console";
-<<<<<<< HEAD
+#recaptcha_image {
+top:0;
+right:0;
+float:left;
+position:relative;
+width:100px;
 }
 
-/* notes */
-#notes {
-	float:right;
-	text-align:right;
-	margin-top:20px;
+.recaptcha_help {
+font-family:MuseoSlab500;
+font-size:80%;
 }
 
-#notes h2 {
-	margin-bottom:10px;
-	font-family:sans-serif;
+#drawcss_title,#drawcss_entry,#youtube_backup_title,#i_like_pandora_title,#fvlc_title,#irssi-notify_title, #powermate_title {
+font-size:1.6em;
 }
 
-.note {
-	margin-bottom:40px;
+#youtube_backup_entry,#i_like_pandora_entry,#matrixnullspace_entry,#fvlc_entry,#irssi-notify_entry,#dylansserver_entry,#metadata_writer_entry,#powermate_entry,#cellular-automaton_entry {
+font-size:1.4em;
 }
 
-.note p {
-	margin-bottom:5px;
+#comment input,#comment textarea {
+border:1px solid grey;
+font-family:InconsolataMedium;
 }
 
-pre {
-	margin-top:10px;
-=======
->>>>>>> no-javascript
+#not_human,#blank_comment {
+color:red;
+display:none;
+font-weight:700;
+margin-bottom:15px;
+margin-top:15px;
 }