Various fixes after latest pull request

duncanmcdougall · Oct 2, 2015 · 8cf3612 · 8cf3612
1 parent a62896a
commit 8cf3612
Show file tree

Hide file tree

Showing 14 changed files with 323 additions and 364 deletions.
diff --git 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']);
 
 };
diff --git a/css/jquery.lightbox.css b/css/jquery.lightbox.css
diff --git a/css/jquery.lightbox.css.map b/css/jquery.lightbox.css.map
diff --git a/demo/demo.css 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;
+    }
diff --git a/demo/disabled_on_mobile.html b/demo/disabled_on_mobile.html
@@ -4,28 +4,8 @@
   <meta charset="utf-8">
   <title>Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" type="text/css" href="../css/jquery.lightbox.css">
-  <style type="text/css">
-    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;
-    }
-  </style>
+  <link rel="stylesheet" type="text/css" href="../jquery.lightbox.css">
+  <link rel="stylesheet" href="demo.css">
 </head>
 <body>
 <div class="container">
@@ -44,7 +24,7 @@ <h1>Responsive Lightbox - minSize Demo</h1>
 </div>
 
 
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script src="../jquery.lightbox.js"></script>
 <script>
   // Initiate Lightbox

diff --git a/demo/groups.html b/demo/groups.html
@@ -4,28 +4,8 @@
   <meta charset="utf-8">
   <title>Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" type="text/css" href="../css/jquery.lightbox.css">
-  <style type="text/css">
-    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;
-    }
-  </style>
+  <link rel="stylesheet" type="text/css" href="../jquery.lightbox.css">
+  <link rel="stylesheet" href="demo.css">
 </head>
 <body>
 <div class="container">
@@ -53,7 +33,7 @@ <h2>Group 3</h2>
   </footer>
 </div>
 
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script src="../jquery.lightbox.js"></script>
 <script>
   // Initiate Lightbox

diff --git a/demo/index.html b/demo/index.html
@@ -4,28 +4,8 @@
   <meta charset="utf-8">
   <title>Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" type="text/css" href="../css/jquery.lightbox.css">
-  <style type="text/css">
-    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;
-    }
-  </style>
+  <link rel="stylesheet" type="text/css" href="../jquery.lightbox.css">
+  <link rel="stylesheet" href="demo.css">
 </head>
 <body>
 <div class="container">
@@ -42,7 +22,7 @@ <h1>Responsive Lightbox</h1>
   </footer>
 </div>
 
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script src="../jquery.lightbox.js"></script>
 <script>
   // Initiate Lightbox

diff --git a/demo/index_button_define.html b/demo/index_button_define.html
@@ -4,28 +4,9 @@
   <meta charset="utf-8">
   <title>Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" type="text/css" href="../css/jquery.lightbox.css">
-  <style type="text/css">
-    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;
-    }
-  </style>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="stylesheet" type="text/css" href="../jquery.lightbox.css">
+  <link rel="stylesheet" href="demo.css">
 </head>
 <body>
 <div class="container">
@@ -42,7 +23,7 @@ <h1>Responsive Lightbox - Custom Button Text</h1>
   </footer>
 </div>
 
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script src="../jquery.lightbox.js"></script>
 <script>
   // Initiate Lightbox