aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-07-09 08:37:41 +0000
committerchrisaga <chrisaga@piwigo.org>2006-07-09 08:37:41 +0000
commit3a0e24e4a25132a2f3234e99e297f0ac7e95630c (patch)
treebf71e296137a12f7a5f3b2c94585b7d6a586dbff
parentdcb692644565bda0782c7e79df7142dabadbe1eb (diff)
merge from trunk r1449:1450 into branch 1.6 (DIV.comment)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1451 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--template/yoga/content.css4
-rw-r--r--template/yoga/default-layout.css8
-rw-r--r--template/yoga/picture.css5
3 files changed, 9 insertions, 8 deletions
diff --git a/template/yoga/content.css b/template/yoga/content.css
index eee5baaa0..9eccdeed1 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -113,10 +113,8 @@ UL.categoryActions {
}
#content DIV.comment BLOCKQUOTE {
- margin-top: 1em;
margin-right: 0.5em;
- margin-bottom: 150px;
- padding: 0.5em;
+ overflow: visible; /*avoid a very strange margin behaviour (all browsers) */
}
/* begin chronology/calendar elements*/
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index d087bc8fa..5a7e293ed 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -82,10 +82,16 @@ TEXTAREA.description {
SELECT.categoryList {
height: 20em;
- /*max-width: 60em;*/
width: auto;
}
+DIV.comment BLOCKQUOTE {
+ padding: 0.5em;
+ overflow: auto; /* no solution for IE6 */
+ min-height: 2.75em; /* fix a Gecko bug whith scrollbar and 1 line only */
+}
+
+
/**
* Filter forms are displayed label by label with the input (or select...)
* below the label. Use an UL to make a group (radiobox for instance).
diff --git a/template/yoga/picture.css b/template/yoga/picture.css
index e51db1825..d905adb96 100644
--- a/template/yoga/picture.css
+++ b/template/yoga/picture.css
@@ -131,11 +131,8 @@ TABLE.infoTable TD.value UL {
font-weight: bold;
}
-#comments BLOCKQUOTE {
+#thePicturePage #comments BLOCKQUOTE {
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 {