harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync abook entries from redmatrix

Browse Source 
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
This commit is contained in:
redmatrix
2015-07-02 21:58:28 -07:00
parent 8b2b92fe32 54301a9ff5
commit 1a5898bf80
12 changed files with 1036 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
view/js/main.js
View File

@@ -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: {

4
view/php/theme_init.php
View File

@@ -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');