0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00

revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage

This commit is contained in:
Mark Otto 2013-12-15 14:14:09 -08:00
parent f6fe62cdf7
commit f5c13a3e1b
4 changed files with 29 additions and 29 deletions

View File

@ -182,6 +182,12 @@ base_url: "../"
<div class="col-xs-6 col-sm-4">
<h3>JavaScript components</h3>
<div class="checkbox">
<label>
<input type="checkbox" checked value="component-animations.less">
Component animations (for JS)
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" checked value="dropdowns.less">
@ -226,12 +232,6 @@ base_url: "../"
Responsive utilities
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" checked value="component-animations.less">
Component animations (for JS)
</label>
</div>
</div><!-- .col-xs-6 .col-sm-4 -->
</div><!-- /.row -->
</div>

View File

@ -2266,6 +2266,27 @@ input[type="reset"].btn-block,
input[type="button"].btn-block {
width: 100%;
}
.fade {
opacity: 0;
-webkit-transition: opacity .15s linear;
transition: opacity .15s linear;
}
.fade.in {
opacity: 1;
}
.collapse {
display: none;
}
.collapse.in {
display: block;
}
.collapsing {
position: relative;
height: 0;
overflow: hidden;
-webkit-transition: height .35s ease;
transition: height .35s ease;
}
@font-face {
font-family: 'Glyphicons Halflings';
src: url('../fonts/glyphicons-halflings-regular.eot');
@ -5418,27 +5439,6 @@ button.close {
bottom: 20px;
}
}
.fade {
opacity: 0;
-webkit-transition: opacity .15s linear;
transition: opacity .15s linear;
}
.fade.in {
opacity: 1;
}
.collapse {
display: none;
}
.collapse.in {
display: block;
}
.collapsing {
position: relative;
height: 0;
overflow: hidden;
-webkit-transition: height .35s ease;
transition: height .35s ease;
}
.clearfix:before,
.clearfix:after,
.container:before,

File diff suppressed because one or more lines are too long

2
less/bootstrap.less vendored
View File

@ -16,6 +16,7 @@
@import "buttons.less";
// Components
@import "component-animations.less";
@import "glyphicons.less";
@import "dropdowns.less";
@import "button-groups.less";
@ -44,6 +45,5 @@
@import "carousel.less";
// Utility classes
@import "component-animations.less";
@import "utilities.less";
@import "responsive-utilities.less";