diff --git a/src/js/_main.js b/src/js/_main.js index 3311299..6df1ff0 100755 --- a/src/js/_main.js +++ b/src/js/_main.js @@ -247,6 +247,8 @@ const MainUI = (($) => { // scroll links $('.js-scrollTo').on('click', (e) => { + console.log(`${NAME}: .js-scrollTo`); + e.preventDefault(); const el = e.currentTarget; const $el = $(e.currentTarget); @@ -256,6 +258,7 @@ const MainUI = (($) => { // load external fonts if ($('[data-extfont]').length) { + console.log(`${NAME}: loading external fonts [data-extfont]`); $.getScript( '//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js', () => { @@ -276,6 +279,8 @@ const MainUI = (($) => { // data-set links $('[data-set-target]').on('click', (e) => { + console.log(`${NAME}: [data-set-target]`); + const $el = $(e.currentTarget); const $target = $($el.data('set-target')); @@ -300,6 +305,7 @@ const MainUI = (($) => { // emulate links $('.a[data-href]').on('click', (e) => { + console.log(`${NAME}: js link processing .a[data-href]`); const $el = $(e.currentTarget); const href = $el.data('href'); if (!href.length) { @@ -324,6 +330,8 @@ const MainUI = (($) => { } static detectBootstrapScreenSize() { + console.log(`${NAME}: Detecting screen size`); + const $el = $('
'); let envs = [...Consts.ENVS]; $Body.append($el); @@ -481,7 +489,13 @@ const MainUI = (($) => { }); // hide spinner on target _blank - $('[target="_blank"],.external').on('click submit', () => { + $('[target="_blank"],.external').on('click submit', (e) => { + + if($(e.currentTarget).is('[data-toggle="lightbox"],[data-lightbox-gallery]')){ + return false; + } + + console.log(NAME +': External link'); setTimeout(() => { Spinner.hide(() => { $Body.addClass('loaded'); diff --git a/src/scss/_components/_ui.elemental.scss b/src/scss/_components/_ui.elemental.scss index 2c143a0..fad43ce 100755 --- a/src/scss/_components/_ui.elemental.scss +++ b/src/scss/_components/_ui.elemental.scss @@ -10,7 +10,12 @@ position: relative; padding-top: $grid-gutter-element-height; padding-bottom: $grid-gutter-element-height; - + &:first-child { + padding-top: 0; + } + &:last-child { + padding-bottom: 0; + } // remove paddings of the slideshow &.dynamic__elements__image__elements__elementimage, &.site__elements__sliderelement { @@ -40,20 +45,21 @@ // hide default page title cuz elemental object will be used to display titles &.page-header-element { display: none; - padding-bottom: 0; - margin-bottom: -$grid-gutter-element-height; } } .elements-sm, .page-content-sidebar { - padding-top: ($grid-gutter-element-height / 2); - padding-bottom: ($grid-gutter-element-height / 2); - // Sidebar elements .element { padding-top: ($grid-gutter-element-height / 2); padding-bottom: ($grid-gutter-element-height / 2); + &:first-child { + padding-top: 0; + } + &:last-child { + padding-bottom: 0; + } } }