Skip to content

Commit

Permalink
Merge branch 'release' of github.com:lokesh/lightbox2
Browse files Browse the repository at this point in the history
# Conflicts:
#	dist/css/lightbox.min.css
#	dist/js/lightbox-plus-jquery.js
#	dist/js/lightbox-plus-jquery.min.js
#	dist/js/lightbox-plus-jquery.min.map
#	dist/js/lightbox.js
#	dist/js/lightbox.min.js
#	dist/js/lightbox.min.map
#	package.json
  • Loading branch information
lokesh committed Jul 14, 2019
2 parents fbd39fe + f3f625b commit 9183b82
Show file tree
Hide file tree
Showing 11 changed files with 1,028 additions and 558 deletions.
1 change: 1 addition & 0 deletions dist/css/lightbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ body.lb-disable-scrolling {
text-align: center;
line-height: 0;
font-weight: normal;
outline: none;
}

.lightbox .lb-image {
Expand Down
6 changes: 5 additions & 1 deletion dist/css/lightbox.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9183b82

Please sign in to comment.