disinclined.org
/
git
/
dylansserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MySQL q's are now prepared. Added includes/cms.php
[dylansserver.git]
/
includes
/
style.css
diff --git
a/includes/style.css
b/includes/style.css
index
2b1fc6c
..
102c82c
100644
(file)
--- a/
includes/style.css
+++ b/
includes/style.css
@@
-44,6
+44,10
@@
li {
margin-right:17px;
}
margin-right:17px;
}
+#portfolio li{
+ font-family:sans-serif;
+}
+
#exhibit {
float:right;
}
#exhibit {
float:right;
}
@@
-57,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 {
@@
-65,6
+70,10
@@
li {
#contact_me {
margin-top:100px;
#contact_me {
margin-top:100px;
+<<<<<<< HEAD
+ font-family:sans-serif;
+=======
+>>>>>>> no-javascript
}
/* reprap */
}
/* reprap */
@@
-75,21
+84,31
@@
li {
}
/* peepshow */
}
/* peepshow */
+#peepshow_ {
+ font-style:italic;
+}
#peepshow_title_1 {
font-style:italic;
margin-top:0px;
}
#peephow_title_2 {
#peepshow_title_1 {
font-style:italic;
margin-top:0px;
}
#peephow_title_2 {
- font-style:italic; /* not sure why this isn't working :( */
- background-color:red;
- font:3em;
+ 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;
@@
-124,4
+143,31
@@
li {
#i_like_pandora_entry {
font:1.4em "lucida console";
#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
}
}