From ffaaa0afcbfb66f6f405051d1f773ba073e41a8e Mon Sep 17 00:00:00 2001 From: sammik Date: Tue, 14 Apr 2020 09:25:40 +0200 Subject: [PATCH 1/5] Fixes issue: lightbox not clickable. Lightbox nav holder covered close button. So it needs to have lower z-index. --- src/galleria.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/galleria.js b/src/galleria.js index f9e4602e..51bb400d 100644 --- a/src/galleria.js +++ b/src/galleria.js @@ -2248,7 +2248,7 @@ Galleria = function() { if ( IE > 7 ) { exs = IE < 9 ? 'background:#000;filter:alpha(opacity=0);' : 'background:rgba(0,0,0,0);'; } else { - exs = 'z-index:99999'; + exs = 'z-index:99998'; } cssMap.nextholder += exs; From 663abbe492420a3c87e8b1d8e83b0ec76dbeb9b4 Mon Sep 17 00:00:00 2001 From: sammik Date: Tue, 14 Apr 2020 12:28:46 +0200 Subject: [PATCH 2/5] Boolean in toggleClass Fixes issue, that lightbox toggles "iframe" class each image. --- src/galleria.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/galleria.js b/src/galleria.js index 51bb400d..2ad5e049 100644 --- a/src/galleria.js +++ b/src/galleria.js @@ -2444,7 +2444,7 @@ Galleria = function() { lightbox.image.isIframe = ( data.iframe && !data.image ); - $( lightbox.elems.box ).toggleClass( 'iframe', lightbox.image.isIframe ); + $( lightbox.elems.box ).toggleClass( 'iframe', !!lightbox.image.isIframe ); $( lightbox.image.container ).find( '.galleria-videoicon' ).remove(); From 8ce5ee75bf20e4f1c63dd1ea5567f4b925f15944 Mon Sep 17 00:00:00 2001 From: sammik Date: Tue, 14 Apr 2020 13:22:18 +0200 Subject: [PATCH 3/5] lightbox_open event fix --- src/galleria.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/galleria.js b/src/galleria.js index 2ad5e049..2cf08e58 100644 --- a/src/galleria.js +++ b/src/galleria.js @@ -2408,9 +2408,6 @@ Galleria = function() { lightbox.init(); } - // trigger the event - self.trigger( Galleria.LIGHTBOX_OPEN ); - // temporarily attach some keys // save the old ones first in a cloned object if ( !lightbox.keymap ) { @@ -2422,6 +2419,10 @@ Galleria = function() { right: lightbox.showNext, left: lightbox.showPrev }); + + // trigger the event (can be here, as keymap is set each time lightbox opens) + self.trigger( Galleria.LIGHTBOX_OPEN ); + } $win.off('resize', lightbox.rescale ); From e69ab546761c41aedf05778bb994f73a0a49524e Mon Sep 17 00:00:00 2001 From: sammik Date: Sun, 19 Apr 2020 08:52:58 +0200 Subject: [PATCH 4/5] Fix minor carosel bug. When resize (f.ex. enter fullscreen), carousel remained partialy moved, so some thumbnails were hidden. --- src/galleria.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/galleria.js b/src/galleria.js index 2cf08e58..2ae984a5 100644 --- a/src/galleria.js +++ b/src/galleria.js @@ -1368,7 +1368,10 @@ Galleria = function() { // one extra calculation carousel.width = self.$( 'thumbnails-list' ).width(); - // todo: fix so the carousel moves to the left + // when carousel goes inactive, set default position (if it is not set already) + if ( w <= carousel.width && carousel.current ){ + carousel.set(0); + } }, bindControls: function() { From 1e4cc88fd06031f9de08dda8fcba187df78ea0c3 Mon Sep 17 00:00:00 2001 From: sammik Date: Sun, 19 Apr 2020 09:00:10 +0200 Subject: [PATCH 5/5] Minor themes typos cleanup. Update galleria.classic.css and galleria.twelve.css --- src/themes/classic/galleria.classic.css | 4 ++-- src/themes/twelve/galleria.twelve.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/themes/classic/galleria.classic.css b/src/themes/classic/galleria.classic.css index 28a762b5..f8101a04 100644 --- a/src/themes/classic/galleria.classic.css +++ b/src/themes/classic/galleria.classic.css @@ -95,11 +95,11 @@ cursor: pointer; display: none; } -.galleria-theme-classic .notouch .galleria-info-close:hover{ +.galleria-theme-classic.notouch .galleria-info-close:hover{ opacity:1; filter: alpha(opacity=100); } -.galleria-theme-classic .touch .galleria-info-close:active{ +.galleria-theme-classic.touch .galleria-info-close:active{ opacity:1; filter: alpha(opacity=100); } diff --git a/src/themes/twelve/galleria.twelve.css b/src/themes/twelve/galleria.twelve.css index 48c48ab9..cd5e6bf9 100755 --- a/src/themes/twelve/galleria.twelve.css +++ b/src/themes/twelve/galleria.twelve.css @@ -30,7 +30,7 @@ background: #222 url(bar.png) repeat-x; z-index: 3; } -.galleria-theme-twelve.light .galleria-bar{background:#fff;height:30px;;} +.galleria-theme-twelve.light .galleria-bar{background:#fff;height:30px;} .galleria-theme-twelve .galleria-s1, .galleria-theme-twelve .galleria-s2, .galleria-theme-twelve .galleria-s3,