Skip to content

Commit

Permalink
Added Bootstrap compatibility #69
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Apr 4, 2017
1 parent c444c05 commit 6b0a398
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ $sl-iframe-border-large: 0 none;


### Changelog
**1.10.7 - Added Bootstrap compatibility #69**
**1.10.6 - Merged pull requests #65. Thanks to mstaniuk**
**1.10.5 - Merged pull requests #60 and #61. Thanks to slavanga**
**1.10.4 - Bugfix von #58**
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simplelightbox",
"version": "1.10.6",
"version": "1.10.7",
"homepage": "http://andreknieriem.de/simple-lightbox",
"authors": [
"André Rinas <[email protected]> (http://andreknieriem.de)"
Expand Down
12 changes: 6 additions & 6 deletions dist/simplelightbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ body.hidden-scroll {
background: #fff;
opacity: 0.7;
display: none;
z-index: 1006;
z-index: 1050;
}

/* line 41, ../sass/simplelightbox.scss */
.sl-wrapper {
z-index: 1000;
z-index: 1040;
}
/* line 43, ../sass/simplelightbox.scss */
.sl-wrapper button {
Expand All @@ -38,7 +38,7 @@ body.hidden-scroll {
position: fixed;
right: 30px;
top: 30px;
z-index: 1015;
z-index: 1060;
margin-top: -14px;
margin-right: -14px;
height: 44px;
Expand All @@ -54,7 +54,7 @@ body.hidden-scroll {
position: fixed;
top: 30px;
left: 30px;
z-index: 1015;
z-index: 1060;
color: #000;
font-size: 1rem;
}
Expand All @@ -73,7 +73,7 @@ body.hidden-scroll {
line-height: 44px;
text-align: center;
display: block;
z-index: 1015;
z-index: 1060;
font-family: Arial, Baskerville, monospace;
color: #000;
}
Expand Down Expand Up @@ -189,7 +189,7 @@ body.hidden-scroll {
bottom: 5px;
right: 5px;
color: #000;
z-index: 1005;
z-index: 1060;
}

/* line 192, ../sass/simplelightbox.scss */
Expand Down
2 changes: 1 addition & 1 deletion dist/simplelightbox.min.css

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

12 changes: 6 additions & 6 deletions dist/simplelightbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ body.hidden-scroll {
background: $sl-overlay-background;
opacity: 0.7;
display: none;
z-index: 1006;
z-index: 1050;
}
.sl-wrapper {
z-index: 1000;
z-index: 1040;
button {
border: 0 none;
background: transparent;
Expand All @@ -56,7 +56,7 @@ body.hidden-scroll {
position: fixed;
right: 30px;
top: 30px;
z-index: 1015;
z-index: 1060;
margin-top: -14px;
margin-right: -14px;
height: 44px;
Expand All @@ -72,7 +72,7 @@ body.hidden-scroll {
position: fixed;
top: 30px;
left: 30px;
z-index: 1015;
z-index: 1060;
color: $sl-navigation-color;
font-size: $sl-counter-fontsize;
}
Expand All @@ -89,7 +89,7 @@ body.hidden-scroll {
line-height: 44px;
text-align: center;
display: block;
z-index: 1015;
z-index: 1060;
font-family: $sl-font-family;
color: $sl-navigation-color;
&.sl-next {
Expand Down Expand Up @@ -184,7 +184,7 @@ body.hidden-scroll {
bottom: 5px;
right: 5px;
color: $sl-navigation-color;
z-index: 1005;
z-index: 1060;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simplelightbox",
"version": "1.10.6",
"version": "1.10.7",
"description": "Touch-friendly image lightbox for mobile and desktop with jQuery",
"main": "dist/simple-lightbox.js",
"repository": {
Expand Down

0 comments on commit 6b0a398

Please sign in to comment.