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

diff --git a/includes/style.css b/includes/style.css
index 3bc475c..102c82c 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -3,35 +3,27 @@
 	margin: 0;
 	}
 
+h3 {
+	margin-top:15px;
+}
+
+a {
+	text-decoration:none;
+}
+
+li {
+	list-style:none;
+	display:block;
+}
+
 #structure {
-	padding-top:1px;
-	background-color:#fff;
 	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 {
 	float:right;
-	margin-top:25px;
 	margin-right:15px;
 }
 
@@ -43,52 +35,139 @@
 	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;
-	width:150px:
-	margin-top:25px;
-	margin-right:17px;
 }
 
-.tabs {
+#exhibit h1 {
+	margin-bottom:15px;
+}
+
+.exhibit {
 	width:300px;
-	height:100%;
-	min-height:550px;
+	min-height:600px;
 	border:1px solid black;
-	padding-left:10px;
+	padding:10px;
+	display:none;
 }
 
-.minimizer {
-	float:right;
-	width:5px;
-	height:100%;
-	min-height:550px;
+.shownDiv {
+	border:1px solid black;
+}
+
+#contact_me {
+	margin-top:100px;
+<<<<<<< HEAD
+	font-family:sans-serif;
+=======
+>>>>>>> no-javascript
+}
+
+/* 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;
+<<<<<<< HEAD
 }
 
-.project {
+#peepshow_entry {
+	font:1.4em "lucida console";
+}
+
+=======
+}
+
+#peepshow_entry {
+	font:1.4em "lucida console";
+}
+
+>>>>>>> no-javascript
+/* readoo */
+#readoo_title {
+	font:1.6em arial;
+}
+
+#readoo_entry {
+	font:1.6em arial;
+}
+
+/* drawcss */
+#drawcss_title {
+	font:1.6em "lucida console";
+}
+
+#drawcss_entry {
+	font:1.6em "lucida console";
+ }
+
+/* youtube_backup */
+#youtube_backup_title {
+	font:1.6em "lucida console";
+}
+
+#youtube_backup_entry {
+	font:1.4em "lucida console";
+}
+
+/* i_like_pandora */
+#i_like_pandora_title {
+	font:1.6em "lucida console";
+}
+
+#i_like_pandora_entry {
+	font:1.4em "lucida console";
+<<<<<<< HEAD
+}
+
+/* notes */
+#notes {
 	float:right;
-	list-style:none;
+	text-align:right;
+	margin-top:20px;
 }
 
-.active_project {
-	display:block;
-	/*margin-right:-15px;*/
+#notes h2 {
+	margin-bottom:10px;
+	font-family:sans-serif;
+}
+
+.note {
+	margin-bottom:40px;
+}
+
+.note p {
+	margin-bottom:5px;
 }
 
-.active_tab {
-	/*margin-right:15px;*/
+pre {
+	margin-top:10px;
+=======
+>>>>>>> no-javascript
 }