From 6493cd22c0c72c60354ebbd6d7887bcbbf4e263a Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 15:14:57 -0800 Subject: [PATCH] blah --- docs/assets/css/bootstrap.css | 5 ----- less/carousel.less | 16 +++++++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 43ec1e417b..4771ff4498 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3195,11 +3195,6 @@ a.thumbnail:hover { border-radius: 23px; opacity: 0.5; filter: alpha(opacity=50); - -webkit-transition: all 0.2s linear; - -moz-transition: all 0.2s linear; - -ms-transition: all 0.2s linear; - -o-transition: all 0.2s linear; - transition: all 0.2s linear; } .carousel-control.right { left: auto; diff --git a/less/carousel.less b/less/carousel.less index 254a9f60c7..4163b069f9 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -26,15 +26,15 @@ line-height: 1; } - .active, - .next, + .active, + .next, .prev { display: block; } .active { left: 0; } - .next, + .next, .prev { position: absolute; top: 0; @@ -47,7 +47,7 @@ .prev { left: -100%; } - .next.left, + .next.left, .prev.right { left: 0; } @@ -80,7 +80,13 @@ border: 3px solid @white; .border-radius(23px); .opacity(50); - .transition(all .2s linear); + + // we can't have this transition here + // because webkit cancels the carousel + // animation if you trip this while + // in the middle of another animation + // ;_; + // .transition(opacity .2s linear); // Reposition the right one &.right {