From cc1953df5484ecbbb7d188425f4fab33453f4448 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sun, 10 Aug 2014 00:26:08 +0200 Subject: [PATCH] improve search field animation --- _config.yml | 1 - _src/assets/js/app.js | 6 +++--- _src/assets/styl/animations.styl | 15 +++------------ _src/assets/styl/buttons.styl | 3 ++- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/_config.yml b/_config.yml index 4125eabc..48f6b9b1 100644 --- a/_config.yml +++ b/_config.yml @@ -21,7 +21,6 @@ email: m@kretschmann.io # -------------------- permalink: /:title -relative_permalinks: true paginate: 15 paginate_path: "/page/:num" category_dir: "/" diff --git a/_src/assets/js/app.js b/_src/assets/js/app.js index f7acdd9d..6fd10085 100644 --- a/_src/assets/js/app.js +++ b/_src/assets/js/app.js @@ -35,7 +35,7 @@ var siteNavigation = { }); // show search - $searcharea.removeClass('ready bounceOutUp').addClass('ready bounceInDown'); + $searcharea.removeClass('ready bounceOutUp').addClass('ready slideDown'); $searchfield.focus(); if ( $searchfield.val().length ) { $searchpop.removeClass('hide'); @@ -48,7 +48,7 @@ var siteNavigation = { // bind the hide controls $(document).bind('click.hidethepop', function() { - $searcharea.removeClass('bounceInDown'); + $searcharea.removeClass('slideDown'); $searchpop.addClass('hide'); // unbind the hide controls @@ -78,7 +78,7 @@ var siteNavigation = { e.preventDefault(); // hide search area - $searcharea.removeClass('bounceInDown').addClass('bounceOutUp'); + $searcharea.removeClass('slideDown').addClass('bounceOutUp'); $searchpop.addClass('hide'); // empty search field diff --git a/_src/assets/styl/animations.styl b/_src/assets/styl/animations.styl index 9fb9bf05..d83ed889 100644 --- a/_src/assets/styl/animations.styl +++ b/_src/assets/styl/animations.styl @@ -51,7 +51,7 @@ gpuacceleration() //////////////////////////////////// // Down -@keyframes bounceInDown +@keyframes slideDown 0%, 60%, 75%, 90%, 100% // http://cubic-bezier.com/#.06,.85,.54,1.39 transition-timing-function: cubic-bezier(.06,.85,.54,1) @@ -59,20 +59,11 @@ gpuacceleration() 0% transform: translate3d(0, -100px, 0) - 60% - transform: translate3d(0, 20px, 0) - - 75% - transform: translate3d(0, -10px, 0) - - 90% - transform: translate3d(0, 5px, 0) - 100% transform: none -.bounceInDown - animation: bounceInDown .4s both +.slideDown + animation: slideDown .25s both // Up @keyframes bounceOutUp diff --git a/_src/assets/styl/buttons.styl b/_src/assets/styl/buttons.styl index 9354e1ba..5634b32a 100644 --- a/_src/assets/styl/buttons.styl +++ b/_src/assets/styl/buttons.styl @@ -160,8 +160,9 @@ button @extend .textcenter width: 16px height: 16px - line-height: 1 + line-height: 12px font-size: $font-size-small + padding: 0 border-radius: 16px display: block background: $brand-grey-light