Cleanup and update Ladda to 0.9.4

Remove bower and npm configs since this is just an example of using ladda with Bootstrap and no new functionality is given.
artasquer · Sep 27, 2014 · 02e23a8 · 02e23a8
1 parent 2610e35
commit 02e23a8
Show file tree

Hide file tree

Showing 17 changed files with 215 additions and 158 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 Hakim El Hattab, http://hakim.se
+Copyright (C) 2014 Hakim El Hattab and Maksim Surguy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/bower.json b/bower.json
diff --git a/css/.DS_Store b/css/.DS_Store
diff --git a/css/ladda-theme.scss b/css/ladda-theme.scss
@@ -1,5 +1,4 @@
 /** Contains the default Ladda button theme styles */
-@import 'ladda.scss';
 
 
 /*************************************
@@ -46,10 +45,8 @@ $mint: #16a085;
 	&[disabled],
 	&[data-loading] {
 		border-color: rgba( 0, 0, 0, 0.07 );
-		cursor: default;
-		background-color: #999;
 
-		&:hover {
+		&, &:hover {
 			cursor: default;
 			background-color: #999;
 		}

diff --git a/css/ladda.scss b/css/ladda.scss
@@ -3,7 +3,7 @@
  * http://lab.hakim.se/ladda
  * MIT licensed
  *
- * Copyright (C) 2013 Hakim El Hattab, http://hakim.se
+ * Copyright (C) 2014 Hakim El Hattab, http://hakim.se
  */
 
 
@@ -70,7 +70,7 @@ $spinnerSize: 32px;
 	width: $spinnerSize;
 	height: $spinnerSize;
 	top: 50%;
-	margin-top: -$spinnerSize/2;
+	margin-top: 0;
 	opacity: 0;
 	pointer-events: none;
 }
@@ -127,12 +127,12 @@ $spinnerSize: 32px;
 
 .ladda-button[data-style=expand-right] {
 	.ladda-spinner {
-		right: 14px;
+		right: $spinnerSize/-2 + 10;
 	}
 
 	&[data-size="s"] .ladda-spinner,
 	&[data-size="xs"] .ladda-spinner {
-		right: 4px;
+		right: $spinnerSize/-2 + 4;
 	}
 
 	&[data-loading] {
@@ -156,7 +156,7 @@ $spinnerSize: 32px;
 
 .ladda-button[data-style=expand-left] {
 	.ladda-spinner {
-		left: 14px;
+		left: $spinnerSize/2 + 10;
 	}
 
 	&[data-size="s"] .ladda-spinner,
@@ -189,15 +189,15 @@ $spinnerSize: 32px;
 	.ladda-spinner {
 		top: -$spinnerSize;
 		left: 50%;
-		margin-left: -$spinnerSize/2;
+		margin-left: 0;
 	}
 
 	&[data-loading] {
 		padding-top: 54px;
 
 		.ladda-spinner {
 			opacity: 1;
-			top: 14px;
+			top: ($spinnerSize/ 2) + 10;
 			margin-top: 0;
 		}
 
@@ -223,7 +223,7 @@ $spinnerSize: 32px;
  	.ladda-spinner {
  		top: 62px;
  		left: 50%;
- 		margin-left: -$spinnerSize/2;
+ 		margin-left: 0;
  	}
 
  	&[data-size="s"] .ladda-spinner,
@@ -257,7 +257,7 @@ $spinnerSize: 32px;
 	}
 	.ladda-spinner {
 		left: 100%;
-		margin-left: -$spinnerSize/2;
+		margin-left: 0;
 	}
 
 	&[data-loading] {
@@ -284,7 +284,8 @@ $spinnerSize: 32px;
 	}
 	.ladda-spinner {
 		right: 100%;
-		margin-left: -$spinnerSize/2;
+		margin-left: 0;
+		left: $spinnerSize/2
 	}
 
 	&[data-loading] {
@@ -311,7 +312,7 @@ $spinnerSize: 32px;
 	}
 	.ladda-spinner {
 		left: 50%;
-		margin-left: -$spinnerSize/2;
+		margin-left: 0;
 		margin-top: 1em;
 	}
 
@@ -322,7 +323,7 @@ $spinnerSize: 32px;
 		}
 		.ladda-spinner {
 			opacity: 1;
-			margin-top: -$spinnerSize/2;
+			margin-top: 0;
 		}
 	}
 }
@@ -339,7 +340,7 @@ $spinnerSize: 32px;
 	}
 	.ladda-spinner {
 		left: 50%;
-		margin-left: -$spinnerSize/2;
+		margin-left: 0;
 		margin-top: -2em;
 	}
 
@@ -350,7 +351,7 @@ $spinnerSize: 32px;
 		}
 		.ladda-spinner {
 			opacity: 1;
-			margin-top: -$spinnerSize/2;
+			margin-top: 0;
 		}
 	}
 }
@@ -365,7 +366,7 @@ $spinnerSize: 32px;
 }
 	.ladda-button[data-style=zoom-out] .ladda-spinner {
 		left: 50%;
-		margin-left: -$spinnerSize/2;
+		margin-left: $spinnerSize;
 
 		@include transform( scale( 2.5 ) );
 	}
@@ -381,6 +382,7 @@ $spinnerSize: 32px;
 }
 .ladda-button[data-style=zoom-out][data-loading] .ladda-spinner {
 	opacity: 1;
+	margin-left: 0;
 
 	@include transform( none );
 }
@@ -395,7 +397,7 @@ $spinnerSize: 32px;
 }
 	.ladda-button[data-style=zoom-in] .ladda-spinner {
 		left: 50%;
-		margin-left: -$spinnerSize/2;
+		margin-left: $spinnerSize/-2;
 
 		@include transform( scale( 0.2 ) );
 	}
@@ -411,6 +413,7 @@ $spinnerSize: 32px;
 }
 .ladda-button[data-style=zoom-in][data-loading] .ladda-spinner {
 	opacity: 1;
+	margin-left: 0;
 
 	@include transform( none );
 }
@@ -426,7 +429,7 @@ $spinnerSize: 32px;
 }
 	.ladda-button[data-style=contract] .ladda-spinner {
 		left: 50%;
-		margin-left: -16px;
+		margin-left: 0;
 	}
 
 .ladda-button[data-style=contract][data-loading] {
@@ -450,19 +453,19 @@ $spinnerSize: 32px;
 	overflow: hidden;
 	width: 100px;
 
-	box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0);
+	box-shadow: 0px 0px 0px 2000px rgba(0,0,0,0);
 }
 	.ladda-button[data-style=contract-overlay] .ladda-spinner {
 		left: 50%;
-		margin-left: -16px;
+		margin-left: 0;
 	}
 
 .ladda-button[data-style=contract-overlay][data-loading] {
 	border-radius: 50%;
 	width: 52px;
 
 	/*outline: 10000px solid rgba( 0, 0, 0, 0.5 );*/
-	box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0.8);
+	box-shadow: 0px 0px 0px 2000px rgba(0,0,0,0.8);
 }
 	.ladda-button[data-style=contract-overlay][data-loading] .ladda-label {
 		opacity: 0;