This repository has been archived by the owner on Feb 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Fixed #2147 - Caption overlaps bottom video-controls
- Loading branch information
Showing
9 changed files
with
736 additions
and
586 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,68 @@ | ||
| var gulp = require('gulp'), | ||
| livereload = require('gulp-livereload'), | ||
| concat = require('gulp-concat'), | ||
| uglify = require('gulp-uglify'), | ||
| rename = require('gulp-rename'), | ||
| cssnano = require('gulp-cssnano'), | ||
| sass = require('gulp-sass'), | ||
| autoprefixer = require('gulp-autoprefixer'), | ||
| header = require('gulp-header'), | ||
| replace = require('gulp-replace'), | ||
| gutil = require('gulp-util'); | ||
| var gulp = require("gulp"), | ||
| concat = require("gulp-concat"), | ||
| uglify = require("gulp-uglify"), | ||
| rename = require("gulp-rename"), | ||
| cssnano = require("gulp-cssnano"), | ||
| autoprefixer = require("gulp-autoprefixer"), | ||
| header = require("gulp-header"), | ||
| replace = require("gulp-replace"); | ||
|
|
||
| var pkg = require('./package.json'); | ||
| var banner = ['// ==================================================', | ||
| '// fancyBox v${pkg.version}', | ||
| '//', | ||
| '// Licensed GPLv3 for open source use', | ||
| '// or fancyBox Commercial License for commercial use', | ||
| '//', | ||
| '// http://fancyapps.com/fancybox/', | ||
| '// Copyright ${new Date().getFullYear()} fancyApps', | ||
| '//', | ||
| '// ==================================================', | ||
| ''].join('\n'); | ||
| var pkg = require("./package.json"); | ||
| var banner = [ | ||
| "// ==================================================", | ||
| "// fancyBox v${pkg.version}", | ||
| "//", | ||
| "// Licensed GPLv3 for open source use", | ||
| "// or fancyBox Commercial License for commercial use", | ||
| "//", | ||
| "// http://fancyapps.com/fancybox/", | ||
| "// Copyright ${new Date().getFullYear()} fancyApps", | ||
| "//", | ||
| "// ==================================================", | ||
| "" | ||
| ].join("\n"); | ||
|
|
||
| // Concatenate & Minify JS | ||
|
|
||
| gulp.task('scripts', function() { | ||
| return gulp.src([ | ||
| 'src/js/core.js', | ||
| 'src/js/media.js', | ||
| 'src/js/guestures.js', | ||
| 'src/js/slideshow.js', | ||
| 'src/js/fullscreen.js', | ||
| 'src/js/thumbs.js', | ||
| 'src/js/hash.js', | ||
| 'src/js/wheel.js' | ||
| ]) | ||
| .pipe(concat('jquery.fancybox.js')) | ||
| .pipe(replace(/({fancybox-version})/g, pkg.version)) | ||
| .pipe(header(banner, { pkg : pkg } )) | ||
| .pipe(gulp.dest('dist')) | ||
| .pipe(rename({suffix: '.min'})) | ||
| .pipe(uglify()) | ||
| .pipe(header(banner, { pkg : pkg } )) | ||
| .pipe(gulp.dest('dist')); | ||
| }); | ||
|
|
||
| gulp.task("scripts", function() { | ||
| return gulp | ||
| .src([ | ||
| "src/js/core.js", | ||
| "src/js/media.js", | ||
| "src/js/guestures.js", | ||
| "src/js/slideshow.js", | ||
| "src/js/fullscreen.js", | ||
| "src/js/thumbs.js", | ||
| "src/js/hash.js", | ||
| "src/js/wheel.js" | ||
| ]) | ||
| .pipe(concat("jquery.fancybox.js")) | ||
| .pipe(replace(/({fancybox-version})/g, pkg.version)) | ||
| .pipe(header(banner, {pkg: pkg})) | ||
| .pipe(gulp.dest("dist")) | ||
| .pipe(rename({suffix: ".min"})) | ||
| .pipe(uglify()) | ||
| .pipe(header(banner, {pkg: pkg})) | ||
| .pipe(gulp.dest("dist")); | ||
| }); | ||
|
|
||
| // Compile CSS | ||
|
|
||
| gulp.task('css', function() { | ||
| return gulp.src('src/css/*.css') // Gets all files src/css | ||
| .pipe(sass()) | ||
| .pipe(autoprefixer({ | ||
| browsers: ['last 5 versions'], | ||
| cascade: false | ||
| })) | ||
| .pipe(concat('jquery.fancybox.css')) | ||
| .pipe(gulp.dest('dist')) | ||
| .pipe(rename({suffix: '.min'})) | ||
| .pipe(cssnano({zindex: false})) | ||
| .pipe(gulp.dest('dist')); | ||
| gulp.task("css", function() { | ||
| return gulp | ||
| .src("src/css/*.css") // Gets all files src/css | ||
| .pipe( | ||
| autoprefixer({ | ||
| browsers: ["last 5 versions"], | ||
| cascade: false | ||
| }) | ||
| ) | ||
| .pipe(concat("jquery.fancybox.css")) | ||
| .pipe(gulp.dest("dist")) | ||
| .pipe(rename({suffix: ".min"})) | ||
| .pipe(cssnano({zindex: false})) | ||
| .pipe(gulp.dest("dist")); | ||
| }); | ||
|
|
||
| // Default Task | ||
| gulp.task('default', ['scripts', 'css']); | ||
| gulp.task("default", ["scripts", "css"]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters