Skip to content

Commit

Permalink
Add max-width: inherit css rule to lb-image class. This fixes conflic…
Browse files Browse the repository at this point in the history
…t with bootstrap which sets max-width: 100% to all img tags.
  • Loading branch information
lokesh committed Jul 9, 2013
1 parent 50d5eb6 commit c5b545b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
41 changes: 21 additions & 20 deletions css/lightbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,19 @@ body:after {
.lightbox .lb-image {
display: block;
height: auto;
max-width: inherit;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
}
/* line 32, ../sass/lightbox.sass */
/* line 33, ../sass/lightbox.sass */
.lightbox a img {
border: none;
}

/* line 35, ../sass/lightbox.sass */
/* line 36, ../sass/lightbox.sass */
.lb-outerContainer {
position: relative;
background-color: white;
Expand All @@ -62,12 +63,12 @@ body:after {
clear: both;
}

/* line 44, ../sass/lightbox.sass */
/* line 45, ../sass/lightbox.sass */
.lb-container {
padding: 4px;
}

/* line 47, ../sass/lightbox.sass */
/* line 48, ../sass/lightbox.sass */
.lb-loader {
position: absolute;
top: 43%;
Expand All @@ -78,7 +79,7 @@ body:after {
line-height: 0;
}

/* line 56, ../sass/lightbox.sass */
/* line 57, ../sass/lightbox.sass */
.lb-cancel {
display: block;
width: 32px;
Expand All @@ -87,7 +88,7 @@ body:after {
background: url(../img/loading.gif) no-repeat;
}

/* line 63, ../sass/lightbox.sass */
/* line 64, ../sass/lightbox.sass */
.lb-nav {
position: absolute;
top: 0;
Expand All @@ -97,17 +98,17 @@ body:after {
z-index: 10;
}

/* line 71, ../sass/lightbox.sass */
/* line 72, ../sass/lightbox.sass */
.lb-container > .nav {
left: 0;
}

/* line 74, ../sass/lightbox.sass */
/* line 75, ../sass/lightbox.sass */
.lb-nav a {
outline: none;
}

/* line 77, ../sass/lightbox.sass */
/* line 78, ../sass/lightbox.sass */
.lb-prev, .lb-next {
width: 49%;
height: 100%;
Expand All @@ -116,7 +117,7 @@ body:after {
display: block;
}

/* line 84, ../sass/lightbox.sass */
/* line 85, ../sass/lightbox.sass */
.lb-prev {
left: 0;
float: left;
Expand All @@ -127,14 +128,14 @@ body:after {
-o-transition: opacity 0.6s;
transition: opacity 0.6s;
}
/* line 89, ../sass/lightbox.sass */
/* line 90, ../sass/lightbox.sass */
.lb-prev:hover {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
background: url(../img/prev.png) left 48% no-repeat;
}

/* line 93, ../sass/lightbox.sass */
/* line 94, ../sass/lightbox.sass */
.lb-next {
right: 0;
float: right;
Expand All @@ -145,14 +146,14 @@ body:after {
-o-transition: opacity 0.6s;
transition: opacity 0.6s;
}
/* line 98, ../sass/lightbox.sass */
/* line 99, ../sass/lightbox.sass */
.lb-next:hover {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
background: url(../img/next.png) right 48% no-repeat;
}

/* line 102, ../sass/lightbox.sass */
/* line 103, ../sass/lightbox.sass */
.lb-dataContainer {
margin: 0 auto;
padding-top: 5px;
Expand All @@ -172,33 +173,33 @@ body:after {
clear: both;
}

/* line 109, ../sass/lightbox.sass */
/* line 110, ../sass/lightbox.sass */
.lb-data {
padding: 0 4px;
color: #bbbbbb;
}
/* line 112, ../sass/lightbox.sass */
/* line 113, ../sass/lightbox.sass */
.lb-data .lb-details {
width: 85%;
float: left;
text-align: left;
line-height: 1.1em;
}
/* line 117, ../sass/lightbox.sass */
/* line 118, ../sass/lightbox.sass */
.lb-data .lb-caption {
font-size: 13px;
font-weight: bold;
line-height: 1em;
}
/* line 121, ../sass/lightbox.sass */
/* line 122, ../sass/lightbox.sass */
.lb-data .lb-number {
display: block;
clear: left;
padding-bottom: 1em;
font-size: 12px;
color: #999999;
}
/* line 127, ../sass/lightbox.sass */
/* line 128, ../sass/lightbox.sass */
.lb-data .lb-close {
display: block;
float: right;
Expand All @@ -214,7 +215,7 @@ body:after {
-o-transition: opacity 0.2s;
transition: opacity 0.2s;
}
/* line 137, ../sass/lightbox.sass */
/* line 138, ../sass/lightbox.sass */
.lb-data .lb-close:hover {
cursor: pointer;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
Expand Down
1 change: 1 addition & 0 deletions sass/lightbox.sass
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ body:after
.lb-image
display: block
height: auto
max-width: inherit
+border-radius($radius - 1)
a img
border: none
Expand Down

0 comments on commit c5b545b

Please sign in to comment.