]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Rename _animation.scss to _transitions.scss (#21370)
authorMark Otto <markd.otto@gmail.com>
Tue, 20 Dec 2016 05:37:09 +0000 (21:37 -0800)
committerGitHub <noreply@github.com>
Tue, 20 Dec 2016 05:37:09 +0000 (21:37 -0800)
* Rename _animation.scss to _transitions.scss for accuracy

* fix docs reference to file name

* cleanup line breaks

docs/components/collapse.md
scss/_transitions.scss [moved from scss/_animation.scss with 99% similarity]
scss/bootstrap.scss

index 0ece9e453dd1aba4b7e61544f301a1130b2574c7..3e465319e4b631daad6b2d0f99655170fcf652f0 100644 (file)
@@ -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
 
similarity index 99%
rename from scss/_animation.scss
rename to scss/_transitions.scss
index d8c6d1b756289862e48e10bb365b572a74c19843..21754df1142cf4867e83205d74427edf0dd7f3f9 100644 (file)
@@ -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);
 }
index afcfb3268e61b41780edb5008558d4b858da2b4b..6c8da43a3273ec3f70f6eebe479c94f1dfc986e3 100644 (file)
@@ -25,7 +25,7 @@
 @import "buttons";
 
 // Components
-@import "animation";
+@import "transitions";
 @import "dropdown";
 @import "button-group";
 @import "input-group";