Skip to content
This repository has been archived by the owner on Nov 21, 2023. It is now read-only.

Commit

Permalink
Added 's' unit to transition delays
Browse files Browse the repository at this point in the history
To resolve ambiguities and probably a bug in Firefox
  • Loading branch information
terrymun committed Jan 28, 2015
1 parent 25708d5 commit c235de0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions css/fluidbox.css

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

2 changes: 1 addition & 1 deletion css/fluidbox.css.map

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

8 changes: 4 additions & 4 deletions css/fluidbox.less
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
transition: all @transition-duration ease-in-out;

/* To prevent flickering, we delay the showing of the image */
.fluidbox-closed & img { transition: opacity 0 ease-in-out @transition-duration; }
.fluidbox-closed & img { transition: opacity 0s ease-in-out @transition-duration; }
}
.fluidbox-ghost {
background-size: 100% 100%;
Expand All @@ -52,8 +52,8 @@
-moz-transition-property: opacity, -moz-transform;
-o-transition-property: opacity, -o-transform;
transition-property: opacity, transform;
transition-duration: 0, @transition-duration;
transition-delay: @transition-duration, 0;
transition-duration: 0s, @transition-duration;
transition-delay: @transition-duration, 0s;

&::before {
-webkit-animation: fluidboxLoading 1s infinite;
Expand All @@ -77,5 +77,5 @@
opacity: 1;
}

.fluidbox-opened & { transition-delay: 0, 0; }
.fluidbox-opened & { transition-delay: 0s, 0s; }
}
10 changes: 5 additions & 5 deletions css/fluidbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $animation-bg-color: $overlay-bg-color;
transition: all $transition-duration ease-in-out;

/* To prevent flickering, we delay the showing of the image */
.fluidbox-closed & img { transition: opacity 0 ease-in-out $transition-duration; }
.fluidbox-closed & img { transition: opacity 0s ease-in-out $transition-duration; }
}
.fluidbox-ghost {
background-size: 100% 100%;
Expand All @@ -53,8 +53,8 @@ $animation-bg-color: $overlay-bg-color;
-moz-transition-property: opacity, -moz-transform;
-o-transition-property: opacity, -o-transform;
transition-property: opacity, transform;
transition-duration: 0, $transition-duration;
transition-delay: $transition-duration, 0;
transition-duration: 0s, $transition-duration;
transition-delay: $transition-duration, 0s;

&::before {
-webkit-animation: fluidboxLoading 1s infinite;
Expand All @@ -76,8 +76,8 @@ $animation-bg-color: $overlay-bg-color;

.fluidbox-loading &::before {
opacity: 1;
transition-delay: 0;
transition-delay: 0s;
}

.fluidbox-opened & { transition-delay: 0, 0; }
.fluidbox-opened & { transition-delay: 0s, 0s; }
}

0 comments on commit c235de0

Please sign in to comment.