archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1183 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
chrisaga 2006-04-15 10:20:45 +00:00
parent a8c0ca9449
commit 0833feaf86
6 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/.cvsignore
View file

@ -1 +0,0 @@
mysql.inc.php

7
template-common/default-layout.css
View file

@ -1,4 +1,4 @@
/* $Id$ */
/* $Id:$ */
/* Set the width of the menubar for the galery */
#menubar {
@ -7,6 +7,11 @@
#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 */
}
/* Set the width of the menubar for the admin section */
BODY#theAdminPage #menubar {

2
template/yoga/default-layout.css
View file

@ -265,4 +265,4 @@ UL.tagSelection LI {
.tagLevel4 { font-size: 140%; }
.tagLevel3 { font-size: 120%; }
.tagLevel2 { font-size: 100%; }
.tagLevel1 { font-size: 90%; }
.tagLevel1 { font-size: 90%; }

2
template/yoga/fix-ie5-ie6.css Normal file
View file

@ -0,0 +1,2 @@
/* $Id:$ */
/* Issues in IE from 5 to 6 only to to be used with IE7 */

2
template/yoga/fix-khtml.css
View file

@ -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 {

5
template/yoga/header.tpl
View file

@ -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>