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

diff --git a/includes/style.css b/includes/style.css
index 3ea84a2..102c82c 100644
--- a/includes/style.css
+++ b/includes/style.css
@@ -44,6 +44,10 @@ li {
 	margin-right:17px;
 }
 
+#portfolio li{
+	font-family:sans-serif;
+}
+
 #exhibit {
 	float:right;
 }
@@ -57,6 +61,7 @@ li {
 	min-height:600px;
 	border:1px solid black;
 	padding:10px;
+	display:none;
 }
 
 .shownDiv {
@@ -65,6 +70,10 @@ li {
 
 #contact_me {
 	margin-top:100px;
+<<<<<<< HEAD
+	font-family:sans-serif;
+=======
+>>>>>>> no-javascript
 }
 
 /* reprap */
@@ -75,6 +84,9 @@ li {
 }
 
 /* peepshow */
+#peepshow_ {
+	font-style:italic;
+}
 #peepshow_title_1 {
 	font-style:italic;
 	margin-top:0px;
@@ -82,13 +94,21 @@ li {
 
 #peephow_title_2 {
 	font-size:3em;
-	font-style:italic; /* not sure why this isn't working :( */
+<<<<<<< HEAD
 }
 
 #peepshow_entry {
 	font:1.4em "lucida console";
 }
 
+=======
+}
+
+#peepshow_entry {
+	font:1.4em "lucida console";
+}
+
+>>>>>>> no-javascript
 /* readoo */
 #readoo_title {
 	font:1.6em arial;
@@ -123,4 +143,31 @@ li {
 
 #i_like_pandora_entry {
 	font:1.4em "lucida console";
+<<<<<<< HEAD
+}
+
+/* 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
 }