diff options
| author | chrisaga <chrisaga@piwigo.org> | 2006-04-19 17:46:00 +0000 |
|---|---|---|
| committer | chrisaga <chrisaga@piwigo.org> | 2006-04-19 17:46:00 +0000 |
| commit | 49fd1676ab114e425a79533270aed8b09835a9e3 (patch) | |
| tree | a81ad24314a4ec2457a4031ef1f3453a14c2111f | |
| parent | 1ff16a6cf126d74c3de2ec9796d45428224c0647 (diff) | |
- merge trunc r1204:1205 into branch 1.6 (bug 298)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1206 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | template/yoga/default-layout.css | 4 | ||||
| -rw-r--r-- | template/yoga/fix-ie5-ie6.css | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css index 08ae88864..c6c8a8fff 100644 --- a/template/yoga/default-layout.css +++ b/template/yoga/default-layout.css @@ -196,10 +196,6 @@ FORM#categoryPermissions LI { white-space: nowrap; } -#theHeader { - width: 100%; /* <- useless but seems to make IE6 happy */ -} - #theHeader H1 { margin-bottom: 0.5em; } diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css index 4e6daf38e..34195ebda 100644 --- a/template/yoga/fix-ie5-ie6.css +++ b/template/yoga/fix-ie5-ie6.css @@ -1,2 +1,11 @@ /* $Id:$ */ /* Issues in IE from 5 to 6 only to to be used with IE7 */ + +/* to avoid vanishing objects in IE6 */ +H1, #theHeader { + width: 100%; /* <- useless but seems to make IE6 happy */ +} +#content { + height: 1em; /* for IE6 it's like min-height */ +} + |