aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-05-28 17:17:36 -0700
committerMark Otto <[email protected]>2012-05-28 17:17:36 -0700
commit6fc5674466c19f7b70a41e73d8ba9671bab9235f (patch)
tree220ef68a69e41ec42d2ea308d77291b9ea9ea973
parent9699e1d70783122f99b7de67e58a95ddaef1e241 (diff)
parent642f75141d96aa7a9bde3c2288112d09d34fb3d3 (diff)
downloadbootstrap-6fc5674466c19f7b70a41e73d8ba9671bab9235f.tar.xz
bootstrap-6fc5674466c19f7b70a41e73d8ba9671bab9235f.zip
Merge branch 'raymccoy-no-filters' into 2.0.4-wip
-rw-r--r--less/component-animations.less6
1 files changed, 3 insertions, 3 deletions
diff --git a/less/component-animations.less b/less/component-animations.less
index da1f2e535..1e1e78b85 100644
--- a/less/component-animations.less
+++ b/less/component-animations.less
@@ -2,10 +2,10 @@
// --------------------
.fade {
- .opacity(0);
+ opacity: 0;
.transition(opacity .15s linear);
&.in {
- .opacity(100);
+ opacity: 1;
}
}
@@ -17,4 +17,4 @@
&.in {
height: auto;
}
-} \ No newline at end of file
+}