From 7e5f21c2b4e5d28b75f58de1509699eaa49c4872 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Dec 2016 21:37:09 -0800 Subject: [PATCH] Rename _animation.scss to _transitions.scss (#21370) * Rename _animation.scss to _transitions.scss for accuracy * fix docs reference to file name * cleanup line breaks --- docs/components/collapse.md | 2 +- scss/{_animation.scss => _transitions.scss} | 2 -- scss/bootstrap.scss | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) rename scss/{_animation.scss => _transitions.scss} (99%) diff --git a/docs/components/collapse.md b/docs/components/collapse.md index 0ece9e453d..3e465319e4 100644 --- a/docs/components/collapse.md +++ b/docs/components/collapse.md @@ -104,7 +104,7 @@ The collapse plugin utilizes a few classes to handle the heavy lifting: - `.collapse.active` shows the content - `.collapsing` is added when the transition starts, and removed when it finishes -These classes can be found in `_animation.scss`. +These classes can be found in `_transitions.scss`. ### Via data attributes diff --git a/scss/_animation.scss b/scss/_transitions.scss similarity index 99% rename from scss/_animation.scss rename to scss/_transitions.scss index d8c6d1b756..21754df114 100644 --- a/scss/_animation.scss +++ b/scss/_transitions.scss @@ -1,6 +1,5 @@ .fade { opacity: 0; - @include transition($transition-fade); &.active { @@ -31,6 +30,5 @@ tbody { position: relative; height: 0; overflow: hidden; - @include transition($transition-collapse); } diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index afcfb3268e..6c8da43a32 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -25,7 +25,7 @@ @import "buttons"; // Components -@import "animation"; +@import "transitions"; @import "dropdown"; @import "button-group"; @import "input-group";