Merge r7732 from br2.1 to trunk

bug:1813

git-svn-id: http://piwigo.org/svn/trunk@7733 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
Gotcha
2010-11-09 21:52:28 +00:00
parent 64125a60d4
commit 81dfe1f5c8
+2 -1
View File
@@ -612,7 +612,7 @@ ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutt
}
html, body {height:100%; margin:0; padding:0;}
#the_page {min-height:100%; position:relative; padding:0;margin:0;}
#the_page {min-height:100%; position:absolute; width:100%; padding:0;margin:0;}
#pwgMain {padding:10px;padding-bottom:60px;}
#footer {
@@ -761,6 +761,7 @@ html, body {height:100%; margin:0; padding:0;}
/* Set the width of the menubar for the galery */
#menubar {
width: 18em;
margin: 10px 0 50px 10px !important;
}
.content {
margin-left: 20em; /* = #menubar width + 2em */