From 1acabe5fdc21ecf524897a76409e3169aa618e64 Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Sat, 23 Jan 2016 11:21:02 +0200 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=8D=D0=BB=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D1=8B=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20overflow.=20=D0=A1?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BB=D0=B0=D0=B2=D0=BD=D1=83=D1=8E=20=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B2=D0=B5=D1=80=D1=82?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D0=B0=20=D1=82=D0=B8=D1=82=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?.=20=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8=D0=BB=20=D0=BF?= =?UTF-8?q?=D1=80=D1=83=D0=B6=D0=B8=D0=BD=D1=8B=20=D0=B2=D1=81=D0=B5=D1=85?= =?UTF-8?q?=20=D0=B0=D0=BD=D0=B8=D0=BC=D0=B0=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/auth/AuthPage.jsx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/pages/auth/AuthPage.jsx b/src/pages/auth/AuthPage.jsx index e9016c9..372042b 100644 --- a/src/pages/auth/AuthPage.jsx +++ b/src/pages/auth/AuthPage.jsx @@ -94,12 +94,14 @@ import regMessages from 'components/auth/Register.messages'; import {helpLinks as helpLinksStyles} from 'components/auth/helpLinks.scss'; import passwordMessages from 'components/auth/Password.messages'; -const opacitySpringConfig = [60, 15]; -const heightSpringConfig = springConfig; -const transformSpringConfig = [400, 15]; +const opacitySpringConfig = [200, 20]; +const heightSpringConfig = [200, 18]; +const transformSpringConfig = [500, 20]; const firstPageHeight = 70; const secondPageHeight = 280; +// TODO: сделать более быстрый фейд на горизонтальном скролле + class TheDemo extends Component { state = { isFirstPage: true @@ -137,11 +139,12 @@ class TheDemo extends Component { {keys.map((key) => this.getHeader(key, items[key]))} - +
{keys.map((key) => this.getBody(key, items[key]))}
@@ -194,6 +197,7 @@ class TheDemo extends Component { top: 0, left: 0, width: '100%', + WebkitTransform: `translateX(${transformSpring}%)`, transform: `translateX(${transformSpring}%)`, opacity: opacitySpring }; @@ -255,12 +259,14 @@ class TheDemo extends Component { }; var scrollStyle = { + WebkitTransform: `translateY(${transformSpring}%)`, transform: `translateY(${transformSpring}%)` }; var sideScrollStyle = { position: 'relative', zIndex: 2, + WebkitTransform: `translateX(${-Math.abs(transformSpring)}%)`, transform: `translateX(${-Math.abs(transformSpring)}%)` };