Merge commit '6f6a980336c3f1fb8120da0ae33f08c08fcdde52'
This commit is contained in:
commit
2fd277119f
@ -120,7 +120,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
|
|||||||
->label(t("<a href=\"http://www.google.com/analytics/\">Google analytics</a> code."))
|
->label(t("<a href=\"http://www.google.com/analytics/\">Google analytics</a> code."))
|
||||||
->value(module::get_var("th_pear4gallery3", "ga_code"));
|
->value(module::get_var("th_pear4gallery3", "ga_code"));
|
||||||
$group->input("skimm_lim")
|
$group->input("skimm_lim")
|
||||||
->label(t("Limit amount of thumbs in album skimming"))
|
->label(t("Limit amount of thumbs in album skimming (set to 0 to disable)"))
|
||||||
->value(module::get_var("th_pear4gallery3", "skimm_lim", "50"));
|
->value(module::get_var("th_pear4gallery3", "skimm_lim", "50"));
|
||||||
|
|
||||||
/* Advanced Options - Mosaic page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
|
/* Advanced Options - Mosaic page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
|
||||||
|
@ -161,12 +161,11 @@ outline: medium none;
|
|||||||
|
|
||||||
#mosaicTable {
|
#mosaicTable {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 45px;
|
|
||||||
bottom: 40px;
|
bottom: 40px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
margin-top: 5px;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mosaicDetail {
|
#mosaicDetail {
|
||||||
@ -181,6 +180,7 @@ outline: medium none;
|
|||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
padding: 5px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#mosaicImg {
|
#mosaicImg {
|
||||||
@ -213,8 +213,8 @@ outline: medium none;
|
|||||||
}
|
}
|
||||||
#toggleSidebar {
|
#toggleSidebar {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
z-index: 1;
|
z-index: 101;
|
||||||
top: 2px;
|
top: 1px;
|
||||||
left: -18px;
|
left: -18px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,6 +201,7 @@ function mosaicResize() {
|
|||||||
myHeight = myHeight - $('#g-site-status').outerHeight(true) - $('#paginator').outerHeight(true);
|
myHeight = myHeight - $('#g-site-status').outerHeight(true) - $('#paginator').outerHeight(true);
|
||||||
myHeight -= 138;
|
myHeight -= 138;
|
||||||
$('#g-header').css('top', $('#gsNavBar').outerHeight(true) + $('#g-site-status').outerHeight(true) - 4);
|
$('#g-header').css('top', $('#gsNavBar').outerHeight(true) + $('#g-site-status').outerHeight(true) - 4);
|
||||||
|
$('#mosaicTable, #sidebarContainer').css('top', $('#gsNavBar').outerHeight(true) + $('#g-site-status').outerHeight(true) - 2 );
|
||||||
|
|
||||||
if ($('#g-movie').length) {
|
if ($('#g-movie').length) {
|
||||||
myHeight += 18;
|
myHeight += 18;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
name = ".Pear Theme"
|
name = ".Pear Theme"
|
||||||
description = "A theme with the intention to mimic Apples mobile me gallery."
|
description = "A theme with the intention to mimic Apples mobile me gallery."
|
||||||
version = 3.5.2
|
version = 3.5.3
|
||||||
author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
|
author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
|
||||||
site = 1
|
site = 1
|
||||||
admin = 0
|
admin = 0
|
||||||
|
Reference in New Issue
Block a user