From abd10e76c7e426b18842300ebafd492eeaa3f2fc Mon Sep 17 00:00:00 2001 From: Justin DuJardin Date: Sat, 23 Jan 2016 15:24:21 -0800 Subject: [PATCH] feat(switch): match latest angular material animation --- ng2-material/components/switcher/switch.scss | 6 +++++- ng2-material/core/style/variables.scss | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ng2-material/components/switcher/switch.scss b/ng2-material/components/switcher/switch.scss index e5682774..38b0e5ed 100644 --- a/ng2-material/components/switcher/switch.scss +++ b/ng2-material/components/switcher/switch.scss @@ -93,9 +93,13 @@ md-switch { .md-switch-bar, .md-switch-thumb-container, .md-switch-thumb { - transition: all 0.08s linear; + transition: $swift-linear; transition-property: transform, background-color; } + .md-switch-bar, + .md-switch-thumb { + transition-delay: 0.05s; + } } } diff --git a/ng2-material/core/style/variables.scss b/ng2-material/core/style/variables.scss index 4b5e58ad..781932ae 100644 --- a/ng2-material/core/style/variables.scss +++ b/ng2-material/core/style/variables.scss @@ -79,3 +79,7 @@ $swift-ease-in: all $swift-ease-in-duration $swift-ease-in-timing-function !defa $swift-ease-in-out-duration: 0.5s !default; $swift-ease-in-out-timing-function: cubic-bezier(0.35, 0, 0.25, 1) !default; $swift-ease-in-out: all $swift-ease-in-out-duration $swift-ease-in-out-timing-function !default; + +$swift-linear-duration: 0.08s !default; +$swift-linear-timing-function: linear !default; +$swift-linear: all $swift-linear-duration $swift-linear-timing-function !default;