aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-14 17:11:50 -0700
committerfriendica <info@friendica.com>2014-09-14 17:11:50 -0700
commit0a5f0fe10bf7310666b96102e8e0da754d6ca439 (patch)
tree150bd622891d4e373325e79d77167612d40e4ad2 /view/js
parent6be6b41a421f86579164288ea2fa7cebb6edd9d4 (diff)
parentb5241c610fe3eeaebedebc94e43edb802565123a (diff)
downloadvolse-hubzilla-0a5f0fe10bf7310666b96102e8e0da754d6ca439.tar.gz
volse-hubzilla-0a5f0fe10bf7310666b96102e8e0da754d6ca439.tar.bz2
volse-hubzilla-0a5f0fe10bf7310666b96102e8e0da754d6ca439.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js14
1 files changed, 6 insertions, 8 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 13f1fea8f..d0fcf0077 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -708,16 +708,14 @@ function updateConvItems(mode,data) {
justifiedGalleryActive = true;
$('#photo-album-contents-' + bParam_page).justifiedGallery({
lastRow : 'nojustify',
- captions: true,
margins: 3,
- rowHeight : 150,
sizeRangeSuffixes : {
- 'lt100': '',
- 'lt240': '',
- 'lt320': '',
- 'lt500': '',
- 'lt640': '',
- 'lt1024': ''
+ 'lt100': '-2',
+ 'lt240': '-2',
+ 'lt320': '-2',
+ 'lt500': '-0',
+ 'lt640': '-1',
+ 'lt1024': '-0'
}
}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
}