diff --git a/.gitignore b/.gitignore index 73650a1..51b7972 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ build-config.cfg /src/assets/style.css.map /src/assets/scss/.sass-cache /src/assets/vendor/ +!/src/assets/vendor/ekko-lightbox/ /src/style.css /src/vendor/ \ No newline at end of file diff --git a/build.sh b/build.sh index ffe87e0..e440589 100755 --- a/build.sh +++ b/build.sh @@ -34,8 +34,4 @@ mv $destination/assets/vendor/slick/ajax-loader.gif $destination/assets/vendor/s mv $destination/assets/vendor/slick/fonts/ $destination/assets/vendor/slick/css/fonts/ cp $destination/assets/vendor/slick/slick.min.js $destination/assets/vendor/slick/js/slick.min.js -##clean -rm $destination/assets/vendor/ekko-lightbox/.gitignore -rm -rf $destination/assets/vendor/ekko-lightbox/.git - echo "Compilation Finish!!" diff --git a/composer.json b/composer.json index 373fde4..26a97dd 100644 --- a/composer.json +++ b/composer.json @@ -7,8 +7,7 @@ ], "require": { "twbs/bootstrap": "4.*", - "fabianobn/slick": "v1.8.*", - "fabianobn/ekko-lightbox": "dev-master" + "fabianobn/slick": "v1.8.*" }, "scripts": { "post-install-cmd": "bash install.sh", diff --git a/composer.lock b/composer.lock index 3c9f8aa..f16d76f 100644 --- a/composer.lock +++ b/composer.lock @@ -1,62 +1,11 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "39d18487fda0792bc6d9517f079e9e45", + "content-hash": "541310851eea37b91951008f7b4bfdf5", "packages": [ - { - "name": "fabianobn/ekko-lightbox", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/fabianobn/ekko-lightbox.git", - "reference": "a12102c8913e1b28da086d4072cfdcaa2ce2c92d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fabianobn/ekko-lightbox/zipball/a12102c8913e1b28da086d4072cfdcaa2ce2c92d", - "reference": "a12102c8913e1b28da086d4072cfdcaa2ce2c92d", - "shasum": "" - }, - "type": "library", - "extra": { - "vendor": { - "scripts": [ - "dist/ekko-lightbox.js", - "dist/ekko-lightbox.min.js" - ], - "styles": [ - "dist/ekko-lightbox.css" - ], - "files": [ - "dist/ekko-lightbox.min.js.map", - "dist/ekko-lightbox.js.map" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "ashleydw", - "email": "hello@ashleyd.ws" - } - ], - "description": "A lightbox gallery plugin for Bootstrap 4 based on the modal plugin", - "homepage": "https://github.com/ashleydw/lightbox", - "keywords": [ - "bootstrap", - "gallery", - "jquery", - "lightbox", - "modal" - ], - "time": "2018-12-21T18:09:49+00:00" - }, { "name": "fabianobn/slick", "version": "v1.8.2", @@ -78,16 +27,16 @@ }, { "name": "twbs/bootstrap", - "version": "v4.2.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/twbs/bootstrap.git", - "reference": "d50ed9a2bde22067c0e5f21d1614e477e362165a" + "reference": "8fa0d3010112dca5dd6dd501173415856001ba8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/d50ed9a2bde22067c0e5f21d1614e477e362165a", - "reference": "d50ed9a2bde22067c0e5f21d1614e477e362165a", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/8fa0d3010112dca5dd6dd501173415856001ba8b", + "reference": "8fa0d3010112dca5dd6dd501173415856001ba8b", "shasum": "" }, "replace": { @@ -125,15 +74,13 @@ "sass", "web" ], - "time": "2018-12-21T17:03:29+00:00" + "time": "2019-02-13T16:01:40+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "fabianobn/ekko-lightbox": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], diff --git a/install.sh b/install.sh index e9fbfbf..66612c2 100644 --- a/install.sh +++ b/install.sh @@ -27,12 +27,6 @@ echo "Copy Slick for Slider...\n\n"; } recurse_copy("vendor/fabianobn/slick/slick/", "src/assets/vendor/slick/"); -echo "Copy Ekko Lightbox...\n\n"; - if (!file_exists("src/assets/vendor/ekko-lightbox")) { - mkdir("src/assets/vendor/ekko-lightbox/", 0777, true); - } - recurse_copy("vendor/fabianobn/ekko-lightbox/", "src/assets/vendor/ekko-lightbox/"); - echo "Finish Copy files! \n\n"; function recurse_copy($src,$dst) { diff --git a/src/assets/vendor/ekko-lightbox b/src/assets/vendor/ekko-lightbox new file mode 160000 index 0000000..a12102c --- /dev/null +++ b/src/assets/vendor/ekko-lightbox @@ -0,0 +1 @@ +Subproject commit a12102c8913e1b28da086d4072cfdcaa2ce2c92d