wip #1377 @1.5

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index c636b964fea4f39a1e111be74765adfef697ac70..12825271e157f08afaffd51c2581ee2560e84029 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -59,7 +59,9 @@ FluidbookLinks.prototype = {
         $("#links").prepend('<a href="#" class="nonlinkarea"></a>');
         var $this = this;
         if (this.fluidbook.datas.linkBlinkTime > 0 && this.fluidbook.datas.mobileLinksRevealAnim) {
-            this.animateLinks();
+            setTimeout(function () {
+                $this.animateLinks();
+            }, 1000);
         }
         setTimeout(function () {
             $this.fluidbook.initVideos();
@@ -67,27 +69,15 @@ FluidbookLinks.prototype = {
         $(fluidbook).trigger('fluidbooklinksready');
     },
     animateLinks: function () {
+        var $this = this;
+
         var links = $(".link a.displayArea");
-        var bookmarks = $("#links .bookmark:not([data-enabled])");
-        if (Modernizr.csstransitions) {
-            $(links).addClass('animating');
-            $(bookmarks).css('opacity', 1).addClass('animating');
-            setTimeout(function () {
-                $(links).css('opacity', 0);
-                $(bookmarks).css('opacity', 0);
-                setTimeout(function () {
-                    $(links).removeClass('animating').css('opacity', 1);
-                    $(bookmarks).removeClass('animating').css('opacity', "");
-                }, 1100);
-            }, 50);
-        } else {
-            $(links).addClass('animating').fadeOut(1000, function () {
-                $(links).removeClass('animating').show();
-            }).mouseover(function () {
-                $(links).stop().removeClass('animating').css('opacity', 1).show();
-                return true;
-            });
-        }
+        $(links).addClass('animating').css('opacity', 1);
+        TweenMax.to($(links), $this.fluidbook.datas.linkBlinkTime, {
+            opacity: 0, delay: 0.1, onComplete: function () {
+                $(links).removeClass('animating').css('opacity', 1)
+            }
+        });
     },
 
     zoomLink: function (link) {

diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js
index 1c1a2b93e3076602b3315c81250db47e222e31a2..49468ff943a7ff64fee74473bc5e8512db7402a4 100644 (file)
--- a/js/libs/fluidbook/fluidbook.resize.js
+++ b/js/libs/fluidbook/fluidbook.resize.js
@@ -145,7 +145,6 @@ FluidbookResize.prototype = {
             }
         }
 
-
         $("#next").transform({
             scale: cssInterfaceScale,
             translateX: 40 * (1 - interfaceScale) + 'px'
@@ -333,7 +332,6 @@ FluidbookResize.prototype = {
         });
     },
     updateWindow: function () {
-        fb('update window size');
         this.ww = $(window).width();
         this.hh = $(window).height();
         if (window.innerHeight && window.innerHeight != this.hh) {

diff --git a/style/fluidbook.css b/style/fluidbook.css
index 854809bab632c6790b983ffaf3191f58cf023fd5..a19591c546f4d2c731a35d0ea4ab54ebd1cce36a 100644 (file)
--- a/style/fluidbook.css
+++ b/style/fluidbook.css
@@ -683,13 +683,6 @@ header.hidden,
 .no-svg .portrait #fluidbook .bookmark.left[data-enabled] {
   background-image: url("../data/images/bookmark-right-on.png");
 }
-.bookmark.animating {
-  -moz-transition: opacity 1s ease-in;
-  -webkit-transition: opacity 1s ease-in;
-  -o-transition: opacity 1s ease-in;
-  -ms-transition: opacity 1s ease-in;
-  transition: opacity 1s ease-in;
-}
 .bookmark {
   background-repeat: no-repeat;
   background-size: cover;
@@ -699,8 +692,8 @@ header.hidden,
   display: block;
   cursor: pointer;
 }
-.bookmark[data-enabled],
-.bookmark:hover {
+.bookmark [data-enabled],
+.bookmark :hover {
   opacity: 1 !important;
   -moz-transition: none;
   -webkit-transition: none;
@@ -776,7 +769,6 @@ header.hidden,
   -o-box-shadow: inset 1px 1px 0px rgba(255, 255, 255, 0.3);
   background-repeat: no-repeat;
   background-position: 10px 4px;
-  border-radius: 5px;
   padding: 0 13px 0 33px;
   background-size: auto 17px;
 }

diff --git a/style/fluidbook.less b/style/fluidbook.less
index de772cc597ec93a5b631632e2599d8d0cecbfe95..c34cfb6228e9a389fd4f87a182e47355a62c3420 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -309,7 +309,6 @@ a {
        left: 0px;
 }
 
-
 .portrait #shadow > div.right {
        display: none;
 }
@@ -791,13 +790,13 @@ footer.hidden, header.hidden, #interface.hidden {
        background-image: url("../data/images/bookmark-right-on.png");
 }
 
-.bookmark.animating {
-       -moz-transition: opacity 1s ease-in;
-       -webkit-transition: opacity 1s ease-in;
-       -o-transition: opacity 1s ease-in;
-       -ms-transition: opacity 1s ease-in;
-       transition: opacity 1s ease-in;
-}
+//.bookmark.animating {
+//     -moz-transition: opacity 1s ease-in;
+//     -webkit-transition: opacity 1s ease-in;
+//     -o-transition: opacity 1s ease-in;
+//     -ms-transition: opacity 1s ease-in;
+//     transition: opacity 1s ease-in;
+//}
 
 .bookmark {
        background-repeat: no-repeat;
@@ -807,15 +806,14 @@ footer.hidden, header.hidden, #interface.hidden {
        opacity: 0.01;
        display: block;
        cursor: pointer;
-}
-
-.bookmark[data-enabled], .bookmark:hover {
-       opacity: 1 !important;
-       -moz-transition: none;
-       -webkit-transition: none;
-       -o-transition: none;
-       -ms-transition: none;
-       transition: none;
+       [data-enabled], :hover {
+               opacity: 1 !important;
+               -moz-transition: none;
+               -webkit-transition: none;
+               -o-transition: none;
+               -ms-transition: none;
+               transition: none;
+       }
 }
 
 #indexView .bookmark {
@@ -894,8 +892,6 @@ footer.hidden, header.hidden, #interface.hidden {
                        background-repeat: no-repeat;
                        background-position: 10px 4px;
 
-                       border-radius: 5px;
-
                        padding: 0 13px 0 33px;
                        background-size: auto 17px;
                        &.back {