fix conflicts during merge of Arun's tree

[phpfspot.git] / themes / default / stylesheet.css

diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css
index 8fbee2fc55e1af45a5aa2e2e498884c41f9b11db..93e56b79cedf4ce32fd411d3bca32ed2430d17c6 100644 (file)
--- a/themes/default/stylesheet.css
+++ b/themes/default/stylesheet.css
@@ -93,6 +93,55 @@ div.subheader {
    padding:                5px 10px 5px 10px;
    vertical-align:         middle;
    white-space:            nowrap;
+   text-align:             left; 
+   float:                  left;
+}
+
+div.tagresult{ 
+   height:                 1px; 
+   background-color:       #ffffff;
+}
+
+div.tagresulttags{
+   display:                table-cell; 
+   vertical-align:         middle;
+}
+
+div.photo{ 
+   text-align:             left; 
+   margin-top:             20px;
+   margin-left:            20px;
+}
+
+div.photonavigation{ 
+   margin-left:            20px;
+}
+
+div.indexnavigation{ 
+   width:                  100%; 
+   margin-top:             20px;
+}
+
+div.indexnavigationright{ 
+   float:                  right; 
+   width:                  40px; 
+   margin-right:           0px; 
+   padding-right:          10px;
+}
+
+div.indexnavigationleft{ 
+   float:                  left; 
+   margin:                 0px; 
+   padding-left:           10px; 
+   width:                  40px;
+}
+
+div.indexnavigationcenter{ 
+   text-align:             center;
+}
+
+div.textright { 
+   text-align:             right;
 }
 
 div.welcome { 
@@ -101,7 +150,7 @@ div.welcome {
    margin-right:           10px;
 }
 
-div.welcome div { 
+div.welcome  span { 
    float:                  left; 
    padding-right:          10px;
    width:                  150px; 
@@ -215,6 +264,11 @@ span.tags {
    text-decoration:        underline;
 }
 
+div.credits{
+   margin-top:             10px; 
+   margin-left:            10px;
+}
+
 table.calendar tr td {
    border:                 solid 1px #ffffff;
    padding:                1px;
@@ -272,4 +326,4 @@ input, select, textarea {
 
 #slider-1{ 
    margin:                 0 auto;
-}
\ No newline at end of file
+}