diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-01 18:51:47 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-01 18:51:47 -0700 |
| commit | 54301a9ff518224309664cd8c2f23cba0d30cb2d (patch) | |
| tree | dca8fa5cbee573d2fc2629f4e6f00eefb0606de1 /view | |
| parent | 3f38e52caf5ba8d9d3b92ae8c9557276eab62596 (diff) | |
| parent | e068bdc9d7ce0a0c9068727aa1111c849a8f3984 (diff) | |
| download | volse-hubzilla-54301a9ff518224309664cd8c2f23cba0d30cb2d.tar.gz volse-hubzilla-54301a9ff518224309664cd8c2f23cba0d30cb2d.tar.bz2 volse-hubzilla-54301a9ff518224309664cd8c2f23cba0d30cb2d.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 1 | ||||
| -rw-r--r-- | view/php/theme_init.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 698e2d79c..5fe778488 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -741,6 +741,7 @@ function pageUpdate() { function justifyPhotos() { justifiedGalleryActive = true; $('#photo-album-contents').justifiedGallery({ + selector: '> a, > div:not(.spinner, #page-end)', margins: 3, border: 0, sizeRangeSuffixes: { diff --git a/view/php/theme_init.php b/view/php/theme_init.php index c1aeb4ab7..49b3511c9 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/justifiedGallery.css'); +head_add_css('library/justifiedGallery/justifiedGallery.min.css'); head_add_js('jquery.js'); //head_add_js('jquery-migrate-1.1.1.js'); -head_add_js('library/justifiedGallery/jquery.justifiedGallery.js'); +head_add_js('library/justifiedGallery/jquery.justifiedGallery.min.js'); head_add_js('library/sprintf.js/dist/sprintf.min.js'); //head_add_js('jquery-compat.js'); |