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

diff --git a/includes/style.css b/includes/style.css
index 94e69a5..102c82c 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -3,37 +3,23 @@
 	margin: 0;
 	}
 
+h3 {
+	margin-top:15px;
+}
+
 a {
 	text-decoration:none;
 }
 
 li {
 	list-style:none;
+	display:block;
 }
 
 #structure {
-	padding-top:1px;
 	width:960px;
 	margin: 0 auto;
 	margin-top: 30px;
-	text-align: left;
-	border: 10px solid #fff;
-}
-
-#logo_box {
-	background-image:url('../images/logo.png');
-	margin-top:25px;
-	margin-left:25px;
-	width:150px;
-	min-height:150px;
-}
-
-#about_bar {
-	background-image:url('../images/logo.png');
-	margin-top:25px;
-	margin-left:25px;
-	width:150px;
-	min-height:500px;
 }
 
 #banner {
@@ -49,82 +35,139 @@ li {
 	margin-right:15px;
 	padding:5px;
 	padding-left:20px;
-	padding-top:25px;
 	padding-bottom:25px;
 }
 
-.portfolio {
+#portfolio {
 	float:right;
 	width:350px;
 	margin-right:17px;
 }
 
-.portfolio li a {
-	text-decoration:none;
+#portfolio li{
+	font-family:sans-serif;
 }
 
 #exhibit {
 	float:right;
 }
 
-.tabs {
+#exhibit h1 {
+	margin-bottom:15px;
+}
+
+.exhibit {
 	width:300px;
 	min-height:600px;
 	border:1px solid black;
 	padding:10px;
+	display:none;
 }
 
-.project {
-	float:right;
-	list-style:none;
-}
-
-.active_project {
-	display:block;
-	/*margin-right:-15px;*/
+.shownDiv {
+	border:1px solid black;
 }
 
-.active_tab {
-	/*margin-right:15px;*/
+#contact_me {
+	margin-top:100px;
+<<<<<<< HEAD
+	font-family:sans-serif;
+=======
+>>>>>>> no-javascript
 }
 
-.reprap_entry-title {
+/* reprap */
+#reprap_entry {
 	font: 1.5em georgia, times;
 	text-decoration: none;
 	display: block;
 }
 
-.peepshow_entry-title {
-	font:1.6em verdana;
+/* peepshow */
+#peepshow_ {
+	font-style:italic;
+}
+#peepshow_title_1 {
+	font-style:italic;
+	margin-top:0px;
+}
+
+#peephow_title_2 {
+	font-size:3em;
+<<<<<<< HEAD
+}
+
+#peepshow_entry {
+	font:1.4em "lucida console";
 }
 
-.peepshow_entry {
-	font:1.3em verdana;
+=======
 }
-.readoo_entry{
+
+#peepshow_entry {
+	font:1.4em "lucida console";
+}
+
+>>>>>>> no-javascript
+/* readoo */
+#readoo_title {
 	font:1.6em arial;
 }
 
-.drawcss_entry{
+#readoo_entry {
+	font:1.6em arial;
+}
+
+/* drawcss */
+#drawcss_title {
 	font:1.6em "lucida console";
 }
 
-.youtube_backup-entry-title{
+#drawcss_entry {
+	font:1.6em "lucida console";
+ }
+
+/* youtube_backup */
+#youtube_backup_title {
 	font:1.6em "lucida console";
 }
 
-.youtube_backup-entry{
-	font:1.3em "lucida console";
+#youtube_backup_entry {
+	font:1.4em "lucida console";
 }
 
-.i_like_pandora-entry-title{
-	font:2em "lucida console";
+/* i_like_pandora */
+#i_like_pandora_title {
+	font:1.6em "lucida console";
 }
 
-.i_like_pandora-entry{
+#i_like_pandora_entry {
 	font:1.4em "lucida console";
+<<<<<<< HEAD
 }
 
-.shownDiv{
-	border:1px solid black;
+/* notes */
+#notes {
+	float:right;
+	text-align:right;
+	margin-top:20px;
+}
+
+#notes h2 {
+	margin-bottom:10px;
+	font-family:sans-serif;
+}
+
+.note {
+	margin-bottom:40px;
+}
+
+.note p {
+	margin-bottom:5px;
+}
+
+pre {
+	margin-top:10px;
+=======
+>>>>>>> no-javascript
 }