diff options
| author | chrisaga <chrisaga@piwigo.org> | 2006-07-17 23:12:07 +0000 |
|---|---|---|
| committer | chrisaga <chrisaga@piwigo.org> | 2006-07-17 23:12:07 +0000 |
| commit | f004fd47fd4d916065297cdab1adfe972694f646 (patch) | |
| tree | 0e0082c2c6bbb6987e2e2dd21837867c9e6bb933 | |
| parent | 6afc2830e2bcf7ba50db50b114a8456130611f25 (diff) | |
merge from trunk r1478:1479 into branch 1.6 (fix bug 472: tags are displayed outside the menu in Safari and Opera)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1480 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | template/yoga/fix-ie5-ie6.css | 5 | ||||
| -rw-r--r-- | template/yoga/menubar.css | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css index 59e3ccee1..2361418e9 100644 --- a/template/yoga/fix-ie5-ie6.css +++ b/template/yoga/fix-ie5-ie6.css @@ -25,3 +25,8 @@ UL.tagSelection LI INPUT, width: 99%; /* buggy IE box model */ } +/* fix tag clouds : IE doesn't like anything but inline */ +#menubar #menuTagCloud LI +{ + display: inline; +} diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css index f8fbdf914..0d5653779 100644 --- a/template/yoga/menubar.css +++ b/template/yoga/menubar.css @@ -103,6 +103,8 @@ FORM#quickconnect LABEL { #menubar #menuTagCloud LI { - display: inline; - white-space: nowrap; + display: inline; /* FF doesn't see the inline-block below */ + white-space: nowrap; /* No line break in the LI but Opera set nowrap to */ + display: inline-block;/* the whole UL, inline-block fix it. */ + /* IE wants inline in fix-ie5-ie6.css */ } |