vurral · Jun 20, 2013
diff --git a/‎README.md
+3 b/‎README.md
+3
diff --git a/‎css/ladda.scss
+5-1 b/‎css/ladda.scss
+5-1
diff --git a/‎dist/ladda-themeless.min.css
+1-1 b/‎dist/ladda-themeless.min.css
+1-1
diff --git a/‎dist/ladda.min.css
+1-1 b/‎dist/ladda.min.css
+1-1
diff --git a/‎dist/ladda.min.js
+1-1 b/‎dist/ladda.min.js
+1-1
diff --git a/‎package.json
+1-1 b/‎package.json
+1-1
diff --git a/‎test/bootstrap.html
+6,289 b/‎test/bootstrap.html
+6,289
@@ -78,6 +78,9 @@ The project is tested in Chrome and Firefox. It Should Work™ in the current st
 
 ## History
 
+#### 0.5.1
+- Add Bootstrap example
+
 #### 0.5.0
 - Split button visual style and functional styles apart for framework compatibility
 - Spinner size now determined by measuring button using JavaScript
 
@@ -27,7 +27,11 @@ $spinnerSize: 32px;
 }
 
 @mixin transition( $value ) {
-	@include prefix( transition, $value );
+	-webkit-transition: $value !important; // important to override bootstrap
+	   -moz-transition: $value !important;
+	    -ms-transition: $value !important;
+	     -o-transition: $value !important;
+	        transition: $value !important;
 }
 
 @mixin transform( $value ) {
 
@@ -1,6 +1,6 @@
 {
   "name": "Ladda",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Buttons with built-in loading indicators",
   "homepage": "http://lab.hakim.se/ladda",
   "scripts": {
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,11 @@ $spinnerSize: 32px;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@mixin transition( $value ) {`
`30`		`- @include prefix( transition, $value );`
	`30`	`+ -webkit-transition: $value !important; // important to override bootstrap`
	`31`	`+ -moz-transition: $value !important;`
	`32`	`+ -ms-transition: $value !important;`
	`33`	`+ -o-transition: $value !important;`
	`34`	`+ transition: $value !important;`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`@mixin transform( $value ) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Ladda",`
`3`		`- "version": "0.5.0",`
	`3`	`+ "version": "0.5.1",`
`4`	`4`	`"description": "Buttons with built-in loading indicators",`
`5`	`5`	`"homepage": "http://lab.hakim.se/ladda",`
`6`	`6`	`"scripts": {`