aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-15 14:14:09 -0800
committerMark Otto <[email protected]>2013-12-15 14:14:09 -0800
commitf5c13a3e1b2beef5e3335a710993ff8b383d76f7 (patch)
treeceb11b1f9f38a962973f4bd57be3762bcfeba3a4 /dist/css/bootstrap.css
parentf6fe62cdf7327902267e89a79d78d42ee24db5b4 (diff)
downloadbootstrap-f5c13a3e1b2beef5e3335a710993ff8b383d76f7.tar.xz
bootstrap-f5c13a3e1b2beef5e3335a710993ff8b383d76f7.zip
revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css42
1 files changed, 21 insertions, 21 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index d6bd45b39..907fa3a9f 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -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,