aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-12-19 21:37:09 -0800
committerGitHub <[email protected]>2016-12-19 21:37:09 -0800
commit7e5f21c2b4e5d28b75f58de1509699eaa49c4872 (patch)
treeb943cfcd46f6758657a4ef0167dd9f9881e1e468
parenta8b3e09f22cab94d9c3646119154a224559aef74 (diff)
downloadbootstrap-7e5f21c2b4e5d28b75f58de1509699eaa49c4872.tar.xz
bootstrap-7e5f21c2b4e5d28b75f58de1509699eaa49c4872.zip
Rename _animation.scss to _transitions.scss (#21370)
* Rename _animation.scss to _transitions.scss for accuracy * fix docs reference to file name * cleanup line breaks
-rw-r--r--docs/components/collapse.md2
-rw-r--r--scss/_transitions.scss (renamed from scss/_animation.scss)2
-rw-r--r--scss/bootstrap.scss2
3 files changed, 2 insertions, 4 deletions
diff --git a/docs/components/collapse.md b/docs/components/collapse.md
index 0ece9e453..3e465319e 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
index d8c6d1b75..21754df11 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 afcfb3268..6c8da43a3 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";