From 8cf36121525388438be24179dd46764fdd0e6baf Mon Sep 17 00:00:00 2001 From: Duncan McDougall Date: Fri, 2 Oct 2015 15:59:50 +0100 Subject: [PATCH] Various fixes after latest pull request --- Gruntfile.js | 86 +++++++----- css/jquery.lightbox.css | 90 ------------ css/jquery.lightbox.css.map | 7 - demo/demo.css | 22 +++ demo/disabled_on_mobile.html | 26 +--- demo/groups.html | 26 +--- demo/index.html | 26 +--- demo/index_button_define.html | 27 +--- demo/index_with_captions.html | 26 +--- jquery.lightbox.css | 104 ++++++++++++++ ...ightbox.min.css => jquery.lightbox.min.css | 0 less/jquery.lightbox.less | 132 ++++++++++-------- package.json | 1 + scss/jquery.lightbox.scss | 114 +++++++-------- 14 files changed, 323 insertions(+), 364 deletions(-) delete mode 100644 css/jquery.lightbox.css delete mode 100644 css/jquery.lightbox.css.map create mode 100644 demo/demo.css create mode 100644 jquery.lightbox.css rename css/jquery.lightbox.min.css => jquery.lightbox.min.css (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 706e52f..0cfb64f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,43 +1,57 @@ -module.exports = function(grunt) { - - // Project configuration. - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - - uglify: { - build: { - src: 'jquery.lightbox.js', - dest: 'jquery.lightbox.min.js' - }, - options: { - report : 'gzip', - preserveComments : 'some' - } - }, - - cssmin: { - compress: { - files: { - 'jquery.lightbox.min.css': ['jquery.lightbox.css'] +module.exports = function (grunt) { + + // Project configuration. + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + + uglify: { + build: { + src: 'jquery.lightbox.js', + dest: 'jquery.lightbox.min.js' + }, + options: { + report: 'gzip', + preserveComments: 'some' + } + }, + + cssmin: { + compress: { + files: { + 'jquery.lightbox.min.css': ['jquery.lightbox.css'] + } + }, + options: { + report: 'gzip' + } + }, + + jshint: { + all: ['jquery.lightbox.js'] + }, + + copy: { + build: { + files: [{ + src: 'jquery.lightbox.css', + dest: 'scss/jquery.lightbox.scss' + }, + { + src: 'jquery.lightbox.css', + dest: 'less/jquery.lightbox.less' + }] + } } - }, - options: { - report : 'gzip' - } - }, + }); - jshint: { - all: ['jquery.lightbox.js'] - } - }); + // Load the plugin that provides the "uglify" task. - // Load the plugin that provides the "uglify" task. - - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-cssmin'); + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-jshint'); + grunt.loadNpmTasks('grunt-contrib-copy'); - // Default task(s). - grunt.registerTask('default', ['uglify', 'cssmin', 'jshint']); + // Default task(s). + grunt.registerTask('default', ['uglify', 'cssmin', 'jshint', 'copy']); }; \ No newline at end of file diff --git a/css/jquery.lightbox.css b/css/jquery.lightbox.css deleted file mode 100644 index 0b5da48..0000000 --- a/css/jquery.lightbox.css +++ /dev/null @@ -1,90 +0,0 @@ -.lightbox { - cursor: pointer; - position: fixed; - width: 100%; - height: 100%; - top: 0; - left: 0; - background: black; - /* IE Fallback (Solid Colour) */ - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIElEQVQ4T2NkYGDYDMRkA8ZRAxhGw4BhNAyA+WAYpAMAIFgLQfO9BoEAAAAASUVORK5CYII=); - background: rgba(0, 0, 0, 0.7); - -webkit-filter: none !important; - z-index: 9997; } - .lightbox img { - display: block; - position: absolute; - border: 5px solid #fff; - box-shadow: 0 0 20px #000; - border-radius: 1px; } - -body.blurred > * { - -webkit-filter: blur(2px); - -webkit-transform: translate3d(0, 0, 0); } - -.lightbox__loading { - background: url(loading.gif) center center no-repeat; - width: 32px; - height: 32px; - margin: -16px 0 0 -16px; - position: absolute; - top: 50%; - left: 50%; } - -.lightbox__caption { - display: none; - position: absolute; - left: 0; - bottom: 0; - width: 100%; - text-align: center; - z-index: 9998; - background: #000; - background: rgba(0, 0, 0, 0.7); } - .lightbox__caption p { - margin: 0 auto; - max-width: 70%; - display: inline-block; - *display: inline; - *zoom: 1; - padding: 10px; - color: #fff; - font-size: 12px; - line-height: 18px; } - -.lightbox__button { - position: absolute; - z-index: 9999; - background: no-repeat center center; - width: 32px; - height: 32px; - opacity: 0.4; - -webkit-transition: all 0.3s; - -moz-transition: all 0.3s; - -ms-transition: all 0.3s; - transition: all 0.3s; } - .lightbox__button:hover, .lightbox__button:focus { - opacity: 1; - -webkit-transform: scale(1.4); - -moz-transform: scale(1.4); - -ms-transform: scale(1.4); - transform: scale(1.4); } - -.lightbox__close { - right: 10px; - top: 10px; - background-image: url("close.png"); } - -.lightbox__nav { - top: 50%; - margin-top: -16px; } - -.lightbox__nav--next { - right: 10px; - background-image: url("next.png"); } - -.lightbox__nav--prev { - left: 10px; - background-image: url("previous.png"); } - -/*# sourceMappingURL=jquery.lightbox.css.map */ diff --git a/css/jquery.lightbox.css.map b/css/jquery.lightbox.css.map deleted file mode 100644 index 29878ec..0000000 --- a/css/jquery.lightbox.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AAAA,SAAU;EACR,MAAM,EAAE,OAAO;EACf,QAAQ,EAAE,KAAK;EACf,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,GAAG,EAAE,CAAC;EACN,IAAI,EAAE,CAAC;EACP,UAAU,EAAE,KAAY;;EAExB,UAAU,EAAE,mJAAmJ;EAC/J,UAAU,EAAE,kBAAkB;EAC9B,cAAc,EAAE,eAAe;EAC/B,OAAO,EAAE,IAAI;EACb,aAAI;IACF,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,cAAc;IACtB,UAAU,EAAE,aAAa;IACzB,aAAa,EAAE,GAAG;;AAItB,gBAAiB;EACf,cAAc,EAAE,SAAS;EACzB,iBAAiB,EAAE,oBAAoB;;AAGzC,kBAAmB;EACjB,UAAU,EAAE,wCAAwC;EACpD,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,eAAe;EACvB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;EACR,IAAI,EAAE,GAAG;;AAGX,kBAAmB;EACjB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,CAAC;EACP,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,IAAI;EACb,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,kBAAkB;EAC9B,oBAAE;IACA,MAAM,EAAE,MAAM;IACd,SAAS,EAAE,GAAG;IACd,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;;AAIrB,iBAAkB;EAChB,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,UAAU,EAAE,uBAAuB;EACnC,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,GAAG;EACZ,kBAAkB,EAAE,QAAQ;EAC5B,eAAe,EAAE,QAAQ;EACzB,cAAc,EAAE,QAAQ;EACxB,UAAU,EAAE,QAAQ;EACpB,gDAAiB;IACf,OAAO,EAAE,CAAC;IACV,iBAAiB,EAAE,UAAU;IAC7B,cAAc,EAAE,UAAU;IAC1B,aAAa,EAAE,UAAU;IACzB,SAAS,EAAE,UAAU;;AAIzB,gBAAiB;EACf,KAAK,EAAE,IAAI;EACX,GAAG,EAAE,IAAI;EACT,gBAAgB,EAAE,gBAAgB;;AAGpC,cAAe;EACb,GAAG,EAAE,GAAG;EACR,UAAU,EAAE,KAAK;;AAGnB,oBAAqB;EACnB,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,eAAe;;AAGnC,oBAAqB;EACnB,IAAI,EAAE,IAAI;EACV,gBAAgB,EAAE,mBAAmB", -"sources": ["../scss/jquery.lightbox.scss"], -"names": [], -"file": "jquery.lightbox.css" -} \ No newline at end of file diff --git a/demo/demo.css b/demo/demo.css new file mode 100644 index 0000000..b3d567c --- /dev/null +++ b/demo/demo.css @@ -0,0 +1,22 @@ + body { + font-family: sans-serif; + font-size: 1rem; + color: #333; + } + + .container { + max-width: 800px; + margin: 0 auto; + } + + .gallery { + list-style: none; + overflow: hidden; + padding: 0; + margin: 0; + } + + .gallery li { + float: left; + margin: 4px; + } \ No newline at end of file diff --git a/demo/disabled_on_mobile.html b/demo/disabled_on_mobile.html index 0776501..b2cceda 100644 --- a/demo/disabled_on_mobile.html +++ b/demo/disabled_on_mobile.html @@ -4,28 +4,8 @@ Demo - - + +
@@ -44,7 +24,7 @@

Responsive Lightbox - minSize Demo

- + + + + +