disinclined.org
/
git
/
dylansserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged branch 'no-javascript' with notes
[dylansserver.git]
/
includes
/
style.css
diff --git
a/includes/style.css
b/includes/style.css
index
265fcca
..
102c82c
100644
(file)
--- a/
includes/style.css
+++ b/
includes/style.css
@@
-61,6
+61,7
@@
li {
min-height:600px;
border:1px solid black;
padding:10px;
min-height:600px;
border:1px solid black;
padding:10px;
+ display:none;
}
.shownDiv {
}
.shownDiv {
@@
-69,7
+70,10
@@
li {
#contact_me {
margin-top:100px;
#contact_me {
margin-top:100px;
+<<<<<<< HEAD
font-family:sans-serif;
font-family:sans-serif;
+=======
+>>>>>>> no-javascript
}
/* reprap */
}
/* reprap */
@@
-90,12
+94,21
@@
li {
#peephow_title_2 {
font-size:3em;
#peephow_title_2 {
font-size:3em;
+<<<<<<< HEAD
}
#peepshow_entry {
font:1.4em "lucida console";
}
}
#peepshow_entry {
font:1.4em "lucida console";
}
+=======
+}
+
+#peepshow_entry {
+ font:1.4em "lucida console";
+}
+
+>>>>>>> no-javascript
/* readoo */
#readoo_title {
font:1.6em arial;
/* readoo */
#readoo_title {
font:1.6em arial;
@@
-130,6
+143,7
@@
li {
#i_like_pandora_entry {
font:1.4em "lucida console";
#i_like_pandora_entry {
font:1.4em "lucida console";
+<<<<<<< HEAD
}
/* notes */
}
/* notes */
@@
-154,4
+168,6
@@
li {
pre {
margin-top:10px;
pre {
margin-top:10px;
+=======
+>>>>>>> no-javascript
}
}