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

cleanup after recent changes in mod photos

Browse Source
This commit is contained in:
marijus 2014-09-13 16:33:20 +02:00
parent 415be29261
commit dfc8430c8a
3 changed files with 4 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/justifiedGallery/dist/js/jquery.justifiedGallery.js vendored
View File

@ -444,6 +444,7 @@
} }
return this.each(function (index, gallery) { return this.each(function (index, gallery) {
var $gallery = $(gallery); var $gallery = $(gallery);
$gallery.addClass('justified-gallery'); $gallery.addClass('justified-gallery');
@ -492,14 +493,13 @@
} else if (arg === 'norewind') { } else if (arg === 'norewind') {
// In this case we don't rewind, and analyze all the images // In this case we don't rewind, and analyze all the images
} else { } else {
//redmatrix - this makes the gallery jump back to top after new content is loaded
context.settings = $.extend({}, context.settings, arg); context.settings = $.extend({}, context.settings, arg);
rewind(context); rewind(context);
} }
checkSettings(context); checkSettings(context);
context.entries = $gallery.find('> a').toArray(); context.entries = $gallery.find('> a, > div').toArray();
if (context.entries.length === 0) return; if (context.entries.length === 0) return;
// Randomize // Randomize
@ -533,6 +533,7 @@
//DEBUG// console.log('listed ' + $image.attr('alt')); //DEBUG// console.log('listed ' + $image.attr('alt'));
imagesToLoad = true; imagesToLoad = true;
// Spinner start // Spinner start
if (context.spinner.active === false) { if (context.spinner.active === false) {
context.spinner.active = true; context.spinner.active = true;

49
view/css/mod_photos.css
View File

@ -1,11 +1,3 @@
.photo-top-photo, .photo-album-photo {
padding: 10px;
max-width: 300px;
}
.photos-end { .photos-end {
clear: both; clear: both;
margin-bottom: 25px; margin-bottom: 25px;
@ -30,51 +22,11 @@
clear: both; clear: both;
} }
.photo-album-image-wrapper {
float: left;
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
}
.photo-album-image-wrapper .caption {
display: none;
width: 100%;
bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em;
margin: 0px;
}
.photo-album-image-wrapper a:hover .caption {
display:block;
}
#photo-album-end { #photo-album-end {
clear: both; clear: both;
margin-bottom: 25px; margin-bottom: 25px;
} }
.photo-top-image-wrapper {
float: left;
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
}
.photo-top-album-name {
width: 100%;
min-height: 2em;
bottom: 0px;
padding: 0px 3px;
padding-top: 0.5em;
}
#photo-top-end {
clear: both;
}
#photo-top-links {
margin-bottom: 30px;
margin-left: 30px;
}
#photos-upload-newalbum-div { #photos-upload-newalbum-div {
float: left; float: left;
width: 175px; width: 175px;
@ -83,6 +35,7 @@
#photos-upload-noshare { #photos-upload-noshare {
margin-bottom: 10px; margin-bottom: 10px;
} }
#photos-upload-existing-album-text { #photos-upload-existing-album-text {
float: left; float: left;
width: 175px; width: 175px;

13
view/theme/redbasic/css/style.css
View File

@ -675,10 +675,6 @@ aside li {
margin: auto; margin: auto;
} }
.photo-top-image-wrapper, .photo-album-image-wrapper {
width: 240px;
}
.photo-top-photo-link, .photo-album-photo-link { .photo-top-photo-link, .photo-album-photo-link {
display: block; display: block;
width: 100%; width: 100%;
@ -688,15 +684,6 @@ aside li {
overflow: hidden; overflow: hidden;
} }
.photo-album-image-wrapper .caption {
background-color: $acpopup_bgcolour;
border-bottom: 2px solid $acpopup_bordercolour;
}
.photo-top-album-name {
background-color: $acpopup_bgcolour;
}
#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
color: #8888FF; color: #8888FF;
text-decoration: none; text-decoration: none;