From 4b708f59fefbb63a7d97366e52d403ad42878b3f Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Thu, 26 Apr 2018 04:00:51 -0400 Subject: [PATCH] Minor modifications to menu animation. --- app/assets/css/launcher.css | 10 +++++----- app/assets/js/scripts/landing.js | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 68139e2a..38c25e56 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -898,7 +898,7 @@ p { /* Upper content container. */ #landingContainer > #upper { position: relative; - transition: 2s ease; + transition: top 2s ease; top: 0px; height: 77%; display: flex; @@ -928,7 +928,7 @@ p { } #landingContainer > #lower > #left { position: relative; - transition: 2s ease; + transition: top 2s ease; top: 0px; height: 100%; width: 33%; @@ -944,7 +944,7 @@ p { } #landingContainer > #lower > #center { position: relative; - transition: 2s ease; + transition: top 2s ease; top: 0px; height: 100%; width: 34%; @@ -952,13 +952,13 @@ p { justify-content: center; } #landingContainer > #lower > #center #content { - transition: 2s ease; position: relative; + transition: top 2s ease; top: 10px; } #landingContainer > #lower > #right { position: relative; - transition: 2s ease; + transition: top 2s ease; top: 0px; height: 100%; width: 33%; diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 4c879fbc..16e9bf34 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -115,7 +115,13 @@ function slide_(up){ lCLCenter.style.top = '-200vh' lCLRight.style.top = '-200vh' menuBtn.style.top = '130vh' + setTimeout(() => { + lCLCenter.style.transition = 'none' + menuBtn.style.transition = 'none' + }, 2000) } else { + lCLCenter.style.transition = null + menuBtn.style.transition = null lCUpper.style.top = '0px' lCLLeft.style.top = '0px' lCLCenter.style.top = '0px'