diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-02 21:58:28 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-02 21:58:28 -0700 |
| commit | 1a5898bf80246fca87ecd7a56f9b7e4780e4089c (patch) | |
| tree | 7f80261ecac578fe8cedd1b32c591d37eda86dd8 /view | |
| parent | 8b2b92fe3267af0b7f3fea33940a440c847c84f2 (diff) | |
| parent | 54301a9ff518224309664cd8c2f23cba0d30cb2d (diff) | |
| download | volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.gz volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.bz2 volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.zip | |
sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
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'); |