diff options
| author | chrisaga <chrisaga@piwigo.org> | 2006-04-15 10:20:45 +0000 |
|---|---|---|
| committer | chrisaga <chrisaga@piwigo.org> | 2006-04-15 10:20:45 +0000 |
| commit | 0833feaf86e36e066db7d7de3c2a897c43521bf1 (patch) | |
| tree | 12af289fd529462b918b7a9ca7d03d0118eb22df /template | |
| parent | a8c0ca94498413670e8cbf994650176cde9be71c (diff) | |
- merge trunc r1178:1182 into branch 1.6 (template fixes)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1183 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template')
| -rw-r--r-- | template/yoga/default-layout.css | 2 | ||||
| -rw-r--r-- | template/yoga/fix-ie5-ie6.css | 2 | ||||
| -rw-r--r-- | template/yoga/fix-khtml.css | 2 | ||||
| -rw-r--r-- | template/yoga/header.tpl | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css index f42cfc1a7..5d6705a4f 100644 --- a/template/yoga/default-layout.css +++ b/template/yoga/default-layout.css @@ -265,4 +265,4 @@ UL.tagSelection LI { .tagLevel4 { font-size: 140%; } .tagLevel3 { font-size: 120%; } .tagLevel2 { font-size: 100%; } -.tagLevel1 { font-size: 90%; }
\ No newline at end of file +.tagLevel1 { font-size: 90%; } diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css new file mode 100644 index 000000000..4e6daf38e --- /dev/null +++ b/template/yoga/fix-ie5-ie6.css @@ -0,0 +1,2 @@ +/* $Id:$ */ +/* Issues in IE from 5 to 6 only to to be used with IE7 */ diff --git a/template/yoga/fix-khtml.css b/template/yoga/fix-khtml.css index cbf276b4a..e071061c9 100644 --- a/template/yoga/fix-khtml.css +++ b/template/yoga/fix-khtml.css @@ -1,4 +1,4 @@ -/* $Id:*/ +/* $Id$ */ /* Issue in Safari/Konqueror only */ /* If H2 has a 0 margin-top categoryActions doesn't float right but overwrites H2 */ #content>DIV.titrePage>H2 { diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 48b187e6d..c9708033c 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -8,6 +8,9 @@ <!-- the next css is used to fix khtml (Konqueror/Safari) issue the "text/nonsense" prevents gecko based browsers to load it --> <link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css"> +<!--[if lt IE 7]> +<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css"> +<![endif]--> <link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css"> <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css"> <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css"> @@ -19,7 +22,7 @@ the "text/nonsense" prevents gecko based browsers to load it --> <!-- END refresh --> <title>{GALLERY_TITLE}:{PAGE_TITLE}</title> <script type="text/javascript" src="{pwg_root}include/scripts.js"></script> -<!--[if gte IE 5.5000]> +<!--[if lt IE 7]> <script type="text/javascript" src="{pwg_root}include/pngfix.js"></script> <![endif]--> </head> |