Permalink
Browse files

merge

  • Loading branch information...
2 parents 8f44961 + ce797fa commit 70d6a70630bda95083a369d2935d570b41c705fa @Evangenieur committed Dec 24, 2012
@@ -313,7 +313,7 @@ window.hvidio =
$hashtags
.css('top', (fp.top) + 'px')
.css('left', (fp.left + ($keyword.outerWidth())) + 'px')
- .fadeIn('slow');
+ .addClass('animated fadeInUp').show();
toggle: ->
if $main.is(":visible")
@@ -338,8 +338,7 @@ window.hvidio =
fadeImg: (html) ->
$("#results img").each ->
$(this).on "load", ->
- $(this).css("visibility", "visible").hide().fadeIn()
-
+ $(this).addClass 'animated fadeIn'
this
@@ -22,6 +22,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-ms-animation-duration: 1s;
-o-animation-duration: 1s;
animation-duration: 1s;
+
+ -webkit-transform: translateZ(0)
}
.animated.hinge {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -222,8 +222,6 @@ p.tagline {
position: relative;
&.current {
- visibility: visible;
-
.play {
background: none;
}
@@ -328,9 +326,9 @@ p.tagline {
}
img.preview {
- //visibility: hidden;
width: 210px;
height: 135px;
+ opacity: 0;
}
}
}

0 comments on commit 70d6a70

Please sign in to comment.