Added cms.php

[dylansserver.git] / includes / style.css

diff --git a/includes/style.css b/includes/style.css
index 102c82c..8b7d97c 100644 (file)
--- a/includes/style.css
+++ b/includes/style.css
@@ -36,12 +36,12 @@ li {
        padding:5px;
        padding-left:20px;
        padding-bottom:25px;
+       text-align:right;
 }
 
 #portfolio {
        float:right;
        width:350px;
-       margin-right:17px;
 }
 
 #portfolio li{
@@ -62,6 +62,7 @@ li {
        border:1px solid black;
        padding:10px;
        display:none;
+       text-align:left;
 }
 
 .shownDiv {
@@ -70,10 +71,9 @@ li {
 
 #contact_me {
        margin-top:100px;
-<<<<<<< HEAD
        font-family:sans-serif;
-=======
->>>>>>> no-javascript
+       text-align:right;
+       clear:both;
 }
 
 /* reprap */
@@ -94,30 +94,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,17 +129,16 @@ li {
 
 #i_like_pandora_entry {
        font:1.4em "lucida console";
-<<<<<<< HEAD
 }
 
 /* notes */
-#notes {
+#notes, #note {
        float:right;
        text-align:right;
        margin-top:20px;
 }
 
-#notes h2 {
+#notes h2, #note h2 {
        margin-bottom:10px;
        font-family:sans-serif;
 }
@@ -168,6 +153,8 @@ li {
 
 pre {
        margin-top:10px;
-=======
->>>>>>> no-javascript
+}
+
+#navigation {
+       text-align:right;
 }