merge from trunk svn:1387:1389 into branch 1.6

fix bug 411 and some other cosmetic issues

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1390 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 17 insertions, 22 deletions

diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index a9fc2da1c..855b7e7dc 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -13,15 +13,16 @@ BODY {
 }
 
 H1 {
-    text-align: center;
-    font-size: 150%;
-    font-weight: bold;
-    padding: 0; margin: 1ex 0 2ex 0;
+  text-align: center;
+  font-size: 150%;
+  font-weight: bold;
+  padding: 0;
+  margin: 0.5em 0 1em 0;
 }
 
 H2 {
     margin: 0;
-    padding: 5px 5px 5px 5px;
+    padding: 5px 0.5em 5px 0.5em;
     text-align: left;
     font-size: 120%;
 }
diff --git a/template/yoga/image.css b/template/yoga/image.css
index 9ecbaea08..42073b4c2 100644
--- a/template/yoga/image.css
+++ b/template/yoga/image.css
@@ -111,39 +111,33 @@ TABLE.infoTable TD.value UL {
 }
 
 #comments {
-    text-align: left;
+  text-align: left;
 }
 
 #comments .comment {
-    margin: 3ex 0;
+  margin: 1em 0;
 }
 
 #comments H2 {
-    margin: 1ex 0;
+  margin: 0.5em 0;
 }
 
 #comments P {
-    margin: 0;
+  margin: 0 0.5em 0 1em;
 }
 
 #comments .author {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 #comments BLOCKQUOTE {
-    margin: 1ex 0 1ex 2em;
-    padding: 4px 4px 0 /* IE bug */ 4px;
-}
-
-#comments BLOCKQUOTE P {
-    margin: 0;
-    padding-bottom: 4px; /* IE bug follow-up */
-}
-#comments BLOCKQUOTE P+P {
-    margin-top: 1ex;
+  margin: 0.5em 1em 1em 4em;
+  padding: 0.5em;
+  overflow: auto;	/* no solution for IE6 */
+  min-height: 2.75em;	/* fix a Gecko bug whith scrollbar and 1 line only */
 }
 
 #comments P.userCommentDelete {
-    float: right;
-    margin: 0;
+  float: right;
+  margin: 0 0.5em 0 0;
 }