Fixed link error with new post display

[dylansserver.git] / includes / style.css

diff --git a/includes/style.css b/includes/style.css
index 102c82c..2dc36e6 100644 (file)
--- a/includes/style.css
+++ b/includes/style.css
@@ -5,6 +5,7 @@
 
 h3 {
        margin-top:15px;
+       font-family:sans-serif;
 }
 
 a {
@@ -36,12 +37,12 @@ li {
        padding:5px;
        padding-left:20px;
        padding-bottom:25px;
+       text-align:right;
 }
 
 #portfolio {
        float:right;
        width:350px;
-       margin-right:17px;
 }
 
 #portfolio li{
@@ -50,6 +51,7 @@ li {
 
 #exhibit {
        float:right;
+       margin-left:17px;
 }
 
 #exhibit h1 {
@@ -62,6 +64,7 @@ li {
        border:1px solid black;
        padding:10px;
        display:none;
+       text-align:left;
 }
 
 .shownDiv {
@@ -70,10 +73,9 @@ li {
 
 #contact_me {
        margin-top:100px;
-<<<<<<< HEAD
        font-family:sans-serif;
-=======
->>>>>>> no-javascript
+       text-align:right;
+       clear:both;
 }
 
 /* reprap */
@@ -94,30 +96,16 @@ li {
 
 #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;
-}
-
-#readoo_entry {
-       font:1.6em arial;
-}
-
 /* drawcss */
 #drawcss_title {
        font:1.6em "lucida console";
@@ -143,11 +131,10 @@ li {
 
 #i_like_pandora_entry {
        font:1.4em "lucida console";
-<<<<<<< HEAD
 }
 
 /* notes */
-#notes {
+#notes, #note {
        float:right;
        text-align:right;
        margin-top:20px;
@@ -158,6 +145,14 @@ li {
        font-family:sans-serif;
 }
 
+#note h2 {
+       font-family:sans-serif;
+}
+
+#comment_link {
+       font-size:80%;
+}
+
 .note {
        margin-bottom:40px;
 }
@@ -168,6 +163,55 @@ li {
 
 pre {
        margin-top:10px;
-=======
->>>>>>> no-javascript
+}
+
+#navigation {
+       text-align:right;
+}
+
+#comments {
+       border-right:1px solid black;
+       padding-right:15px;
+}
+
+.comment {
+       margin-bottom:30px;
+}
+
+#comment {
+       padding-right:15px;
+       border-right:1px solid black;
+       margin-top:15px;
+       text-align:right;
+}
+
+#comment input {
+       border:1px solid grey;
+}
+
+#comment textarea {
+       border:1px solid grey;
+}
+
+#comment .submit {
+       background:#FFF;
+       border:1px solid white;
+       color:blue;
+       cursor:pointer;
+       font-size:120%;
+       font-weight:bold;
+}
+
+#recaptcha_widget {
+       position:relative;
+}
+
+#recaptcha_image {
+       position:absolute;
+       top:0px;
+       right:0px;
+}
+
+#recaptcha_widget {
+       display:none;
 }