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 d67f3ac27db205fd5b04ccdc945d154e87e19910..93e56b79cedf4ce32fd411d3bca32ed2430d17c6 100644 (file)
--- a/themes/default/stylesheet.css
+++ b/themes/default/stylesheet.css
@@ -55,6 +55,10 @@ div.searchfor {
    border-bottom:          solid 1px #000000;
 }
 
    border-bottom:          solid 1px #000000;
 }
 

+div.searchfor td.nowrap { 
+   white-space:            nowrap;
+}
+

 .menu {
    position:               absolute;
    left:                   0px;
 .menu {
    position:               absolute;
    left:                   0px;


@@ -81,6 +85,7 @@ div.header {
    padding:                10px;
    vertical-align:         middle;
    white-space:            nowrap;
    padding:                10px;
    vertical-align:         middle;
    white-space:            nowrap;

+   text-align:             left;

 }
 
 div.subheader {
 }
 
 div.subheader {


@@ -88,6 +93,68 @@ div.subheader {
    padding:                5px 10px 5px 10px;
    vertical-align:         middle;
    white-space:            nowrap;
    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 { 
+   padding:                10px; 
+   margin-left:            10px;  
+   margin-right:           10px;
+}
+
+div.welcome  span { 
+   float:                  left; 
+   padding-right:          10px;
+   width:                  150px; 
+   text-align:             center;

 }
 
 img {
 }
 
 img {


@@ -192,6 +259,16 @@ div.thumb a.thumblink:hover {
    line-height:            21px;
 }
 
    line-height:            21px;
 }
 

+span.tags {
+   vertical-align:         middle; 
+   text-decoration:        underline;
+}
+
+div.credits{
+   margin-top:             10px; 
+   margin-left:            10px;
+}
+

 table.calendar tr td {
    border:                 solid 1px #ffffff;
    padding:                1px;
 table.calendar tr td {
    border:                 solid 1px #ffffff;
    padding:                1px;


@@ -225,13 +302,14 @@ table.calendar tr td {
    vertical-align:         middle;
 }
 
    vertical-align:         middle;
 }
 

-#whiteline {
-   height:                 1px;
-   background-color:       #ffffff;
+#slide_close { 
+   margin:                 0 auto; 
+   padding:                10px;

 }
 
 }
 

-#index {
-   margin-top:             5px;
+#slide_close img { 
+   padding:                15px; 
+   background-color:       #000000;

 }
 
 input.submit,input.checkbox {
 }
 
 input.submit,input.checkbox {


@@ -245,3 +323,7 @@ input, select, textarea {
    border:                 1px solid #888888;
    border-collapse:        collapse;
 }
    border:                 1px solid #888888;
    border-collapse:        collapse;
 }

+
+#slider-1{ 
+   margin:                 0 auto;
+}