min-height:600px;
border:1px solid black;
padding:10px;
+ display:none;
}
.shownDiv {
#contact_me {
margin-top:100px;
+<<<<<<< HEAD
+ font-family:sans-serif;
+=======
+>>>>>>> no-javascript
}
/* reprap */
#peephow_title_2 {
font-size:3em;
+<<<<<<< HEAD
+}
+
+#peepshow_entry {
+ font:1.4em "lucida console";
+}
+
+=======
}
#peepshow_entry {
font:1.4em "lucida console";
}
+>>>>>>> no-javascript
/* readoo */
#readoo_title {
font:1.6em arial;
#i_like_pandora_entry {
font:1.4em "lucida console";
+<<<<<<< HEAD
}
/* notes */
#notes h2 {
margin-bottom:10px;
+ font-family:sans-serif;
}
.note {
.note p {
margin-bottom:5px;
}
+
+pre {
+ margin-top:10px;
+=======
+>>>>>>> no-javascript
+}