diff --git a/assets/app.js b/assets/app.js index 17ae484..f520a40 100644 --- a/assets/app.js +++ b/assets/app.js @@ -23,7 +23,6 @@ audioElement.pause(); audioElement.play(); } - swingDirection = 'forward'; swingLedsToMenu(); var jqThisLamp = jqLiMenuElement.find('.lamp'); var jqThisMenuBg = jqLiMenuElement.find('.menubg'); @@ -40,6 +39,7 @@ }; var swingLedsToMenu = function () { + swingDirection = 'forward'; if (ledTimeoutId) { // Clear if there's any running swing clearTimeout(ledTimeoutId); @@ -66,7 +66,7 @@ var jqMenuLedToLight = $(jqMenuLeds.get(litLedId - 1)); jqMenuLedToLight.addClass('active'); if (doNextCycle) { - ledTimeoutId = setTimeout(lightUpNextLed, 30); + ledTimeoutId = setTimeout(lightUpNextLed, 100); } else { ledTimeoutId = null; } @@ -83,20 +83,11 @@ jqMenuUl = $('#menu-chooser'); jqContentPages = $('.content-center-wrapper .page'); maxMenuCount = jqMenuLeds.length; - $('.page').perfectScrollbar({ + $('.page, .gallery-wrapper').perfectScrollbar({ suppressScrollX: true }); + swingLedsToMenu(); }; - // function menuClick(obj){ - // var src = "images/lampa_animation.gif"; - // obj.attr('src', src); - // var t = setTimeout(function(){ - // var src = obj.attr('src')=="/images/lampa_animation.gif"?"/images/lampa_active.gif":"images/lampa_active.png"; - // obj.attr('src', src); - // window.location = obj.data('location'); - // }, 3000); - // } - $(document).ready(onReadyDocument); })(jQuery); diff --git a/assets/main.css b/assets/main.css index 18b627d..de5d3ff 100644 --- a/assets/main.css +++ b/assets/main.css @@ -85,6 +85,18 @@ a { background-size: 100%; } +.content-left-wrapper .gallery-wrapper { + position: relative; + margin: 25px 2px 0 20px; + height: 291px; + text-align: center; + padding-right: 14px; +} +.content-left-wrapper .gallery-wrapper a img { + margin-bottom: 5px; + max-width: 180px; +} + .content-center-wrapper { background: url('/images/palinkafozo_tartalom.jpg') no-repeat center top; float: left; @@ -266,7 +278,7 @@ a { .ps-container:hover>.ps-scrollbar-y-rail:hover>.ps-scrollbar-y, .ps-container:hover.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y { background-color: #b98850; - box-shadow: 0px 0px 2px 2px 0px 0px 2px 2px #5A390F; + box-shadow: 0px 0px 2px 2px #5A390F; } .ps-container.ps-in-scrolling.ps-y>.ps-scrollbar-y-rail>.ps-scrollbar-y { diff --git a/bower.json b/bower.json index ca63211..dd9b4f4 100644 --- a/bower.json +++ b/bower.json @@ -18,6 +18,7 @@ ], "dependencies": { "jquery": "~2.1.4", - "perfect-scrollbar": "~0.6.2" + "perfect-scrollbar": "~0.6.2", + "lightbox2": "~2.7.1" } } diff --git a/gallery/01.png b/gallery/01.png new file mode 100644 index 0000000..1fb6e0f Binary files /dev/null and b/gallery/01.png differ diff --git a/gallery/02.png b/gallery/02.png new file mode 100644 index 0000000..31137e8 Binary files /dev/null and b/gallery/02.png differ diff --git a/gallery/03.png b/gallery/03.png new file mode 100644 index 0000000..238a81e Binary files /dev/null and b/gallery/03.png differ diff --git a/gallery/04.png b/gallery/04.png new file mode 100644 index 0000000..f8afa1c Binary files /dev/null and b/gallery/04.png differ diff --git a/gallery/05.png b/gallery/05.png new file mode 100644 index 0000000..0f5f897 Binary files /dev/null and b/gallery/05.png differ diff --git a/gallery/06.png b/gallery/06.png new file mode 100644 index 0000000..4788ccd Binary files /dev/null and b/gallery/06.png differ diff --git a/gallery/07.png b/gallery/07.png new file mode 100644 index 0000000..97af6f5 Binary files /dev/null and b/gallery/07.png differ diff --git a/gallery/08.png b/gallery/08.png new file mode 100644 index 0000000..1d03232 Binary files /dev/null and b/gallery/08.png differ diff --git a/gallery/09.png b/gallery/09.png new file mode 100644 index 0000000..b7843d7 Binary files /dev/null and b/gallery/09.png differ diff --git a/gallery/10.png b/gallery/10.png new file mode 100644 index 0000000..014d529 Binary files /dev/null and b/gallery/10.png differ diff --git a/gallery/11.png b/gallery/11.png new file mode 100644 index 0000000..493df65 Binary files /dev/null and b/gallery/11.png differ diff --git a/gallery/thumbnails/01.png b/gallery/thumbnails/01.png new file mode 100644 index 0000000..e7e67e0 Binary files /dev/null and b/gallery/thumbnails/01.png differ diff --git a/gallery/thumbnails/02.png b/gallery/thumbnails/02.png new file mode 100644 index 0000000..273d966 Binary files /dev/null and b/gallery/thumbnails/02.png differ diff --git a/gallery/thumbnails/03.png b/gallery/thumbnails/03.png new file mode 100644 index 0000000..830df6d Binary files /dev/null and b/gallery/thumbnails/03.png differ diff --git a/gallery/thumbnails/04.png b/gallery/thumbnails/04.png new file mode 100644 index 0000000..ecd435f Binary files /dev/null and b/gallery/thumbnails/04.png differ diff --git a/gallery/thumbnails/05.png b/gallery/thumbnails/05.png new file mode 100644 index 0000000..ca486a6 Binary files /dev/null and b/gallery/thumbnails/05.png differ diff --git a/gallery/thumbnails/06.png b/gallery/thumbnails/06.png new file mode 100644 index 0000000..91b4399 Binary files /dev/null and b/gallery/thumbnails/06.png differ diff --git a/gallery/thumbnails/07.png b/gallery/thumbnails/07.png new file mode 100644 index 0000000..4dc3a59 Binary files /dev/null and b/gallery/thumbnails/07.png differ diff --git a/gallery/thumbnails/08.png b/gallery/thumbnails/08.png new file mode 100644 index 0000000..02a729b Binary files /dev/null and b/gallery/thumbnails/08.png differ diff --git a/gallery/thumbnails/09.png b/gallery/thumbnails/09.png new file mode 100644 index 0000000..2696212 Binary files /dev/null and b/gallery/thumbnails/09.png differ diff --git a/gallery/thumbnails/10.png b/gallery/thumbnails/10.png new file mode 100644 index 0000000..d7dd26d Binary files /dev/null and b/gallery/thumbnails/10.png differ diff --git a/gallery/thumbnails/11.png b/gallery/thumbnails/11.png new file mode 100644 index 0000000..07b6146 Binary files /dev/null and b/gallery/thumbnails/11.png differ diff --git a/images/palinkafozo_tartalom.jpg b/images/palinkafozo_tartalom.jpg index e3115dc..a479ca1 100644 Binary files a/images/palinkafozo_tartalom.jpg and b/images/palinkafozo_tartalom.jpg differ diff --git a/index.html b/index.html index f40f574..36225b1 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,17 @@ - - - + + + + Prédikátor Lepárló + + + -Prédikátor Lepárló - - - - + + + + + @@ -20,6 +24,41 @@
+
diff --git a/song/earcing.mp3.asd b/song/earcing.mp3.asd new file mode 100644 index 0000000..1d5e73d Binary files /dev/null and b/song/earcing.mp3.asd differ diff --git a/song/zap.mp3 b/song/zap.mp3 new file mode 100644 index 0000000..bfdf52d Binary files /dev/null and b/song/zap.mp3 differ