diff options
| author | marijus <mario@mariovavti.com> | 2015-02-14 22:18:50 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2015-02-14 22:18:50 +0100 |
| commit | db7b4ea2bf9437f572f1501356753eaf84e954a3 (patch) | |
| tree | a8874959da2d8eee2536468931a8f8ff5f9171f8 /view | |
| parent | 59828593c14a64cecf7ee5c077da9f918062ed60 (diff) | |
| download | volse-hubzilla-db7b4ea2bf9437f572f1501356753eaf84e954a3.tar.gz volse-hubzilla-db7b4ea2bf9437f572f1501356753eaf84e954a3.tar.bz2 volse-hubzilla-db7b4ea2bf9437f572f1501356753eaf84e954a3.zip | |
update justifiedGallery to version 3.5.4 and add ignoreElement option which will hopefully be accepted upstream
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'); |