Changeset 1183

Timestamp:

Apr 15, 2006, 12:20:45 PM (18 years ago)

Author:

chrisaga

Message:

• merge trunc r1178:1182 into branch 1.6 (template fixes)

Location:

branches/branch-1_6

Files:

• include/.cvsignore (deleted)
• template-common/default-layout.css (modified) (2 diffs)
• template/yoga/fix-ie5-ie6.css (copied) (copied from trunk/template/yoga/fix-ie5-ie6.css)
• template/yoga/fix-khtml.css (modified) (1 diff)
• template/yoga/header.tpl (modified) (2 diffs)

branches/branch-1_6/template-common/default-layout.css

@@ -1 @@
-/* $Id$ */
+/* $Id:$ */
 
 /* Set the width of the menubar for the galery */
@@ -7 +7 @@
 #content {
   margin-left: 20em;    /* = #menubar width + 2em */
+}
+/* Set minimum width of the page before getting a scrollbar */
+/* IE5 and IE6 don't get that */
+BODY {
+  min-width: 60em;      /* ~ 3* #menubar width */
 }
 

branches/branch-1_6/template/yoga/fix-khtml.css

@@ -1 @@
-/* $Id:*/
+/* $Id$ */
 /* Issue in Safari/Konqueror only                                                 */
 /* If H2 has a 0 margin-top categoryActions doesn't float right but overwrites H2 */

branches/branch-1_6/template/yoga/header.tpl

@@ -9 +9 @@
 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">
@@ -20 +23 @@
 <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]-->