diff options
| author | friendica <info@friendica.com> | 2015-02-14 21:58:32 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-14 21:58:32 -0800 |
| commit | 0d9508d5ef929be1da10e2e8c30d755c96f5e160 (patch) | |
| tree | 4f94417de8779f51bdc6ba3e8220b52b2ed8ca48 /view | |
| parent | 7ad425bbda549c3937c2feeac593bdcd21167019 (diff) | |
| parent | 884dc5973dcdc8ae3f7497616dea1cdb7a95f061 (diff) | |
| download | volse-hubzilla-0d9508d5ef929be1da10e2e8c30d755c96f5e160.tar.gz volse-hubzilla-0d9508d5ef929be1da10e2e8c30d755c96f5e160.tar.bz2 volse-hubzilla-0d9508d5ef929be1da10e2e8c30d755c96f5e160.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/php/theme_init.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 17ea42db7..7a6798f2f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -713,6 +713,8 @@ function updateConvItems(mode,data) { justifiedGalleryActive = true; $('#photo-album-contents').justifiedGallery({ margins: 3, + border: 0, + ignoreElement: '#page-end', sizeRangeSuffixes: { 'lt100': '-2', 'lt240': '-2', diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0009a00e2..b695bd54e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -9,11 +9,11 @@ head_add_css('library/jRange/jquery.range.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/widgets.css'); head_add_css('view/css/colorbox.css'); -head_add_css('library/justifiedGallery/dist/css/justifiedGallery.css'); +head_add_css('library/justifiedGallery/justifiedGallery.css'); head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css'); head_add_js('jquery.js'); head_add_js('jquery-migrate-1.1.1.js'); -head_add_js('library/justifiedGallery/dist/js/jquery.justifiedGallery.js'); +head_add_js('library/justifiedGallery/jquery.justifiedGallery.js'); //head_add_js('jquery-compat.js'); head_add_js('spin.js'); |