From 5a1b821154f354d2609fd2e8c37bf953162d7f53 Mon Sep 17 00:00:00 2001 From: Tobias Ahlin Date: Mon, 23 Nov 2015 14:21:18 +0100 Subject: [PATCH 1/3] Move "more exact cube sizes" fix to scss file --- scss/spinners/9-cube-grid.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/spinners/9-cube-grid.scss b/scss/spinners/9-cube-grid.scss index 649b681..7a040e4 100644 --- a/scss/spinners/9-cube-grid.scss +++ b/scss/spinners/9-cube-grid.scss @@ -24,8 +24,8 @@ margin: $spinkit-spinner-margin; .sk-cube { - width: 33%; - height: 33%; + width: 33.33%; + height: 33.33%; background-color: $spinkit-spinner-color; float: left; animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; From c4df5a427132483006ca06d50df070e8fa6d7545 Mon Sep 17 00:00:00 2001 From: Tobias Ahlin Date: Mon, 23 Nov 2015 14:22:06 +0100 Subject: [PATCH 2/3] gulp --- css/spinkit.css | 2 +- css/spinners/1-rotating-plane.css | 2 +- css/spinners/10-fading-circle.css | 28 +++++++-------- css/spinners/11-folding-cube.css | 12 +++---- css/spinners/2-double-bounce.css | 8 ++--- css/spinners/3-wave.css | 14 ++++---- css/spinners/4-wandering-cubes.css | 8 ++--- css/spinners/5-pulse.css | 2 +- css/spinners/6-chasing-dots.css | 8 ++--- css/spinners/7-three-bounce.css | 10 +++--- css/spinners/8-circle.css | 28 +++++++-------- css/spinners/9-cube-grid.css | 26 +++++++------- examples/1-rotating-plane.html | 4 +-- examples/10-fading-circle.html | 56 +++++++++++++++--------------- examples/11-folding-cube.html | 24 ++++++------- examples/2-double-bounce.html | 16 ++++----- examples/3-wave.html | 28 +++++++-------- examples/4-wandering-cubes.html | 16 ++++----- examples/5-pulse.html | 4 +-- examples/6-chasing-dots.html | 16 ++++----- examples/7-three-bounce.html | 20 +++++------ examples/8-circle.html | 56 +++++++++++++++--------------- examples/9-cube-grid.html | 48 ++++++++++++------------- 23 files changed, 218 insertions(+), 218 deletions(-) diff --git a/css/spinkit.css b/css/spinkit.css index 13816be..9aabaf6 100644 --- a/css/spinkit.css +++ b/css/spinkit.css @@ -1,7 +1,7 @@ /* * Usage: * -
+
* */ .sk-rotating-plane { diff --git a/css/spinners/1-rotating-plane.css b/css/spinners/1-rotating-plane.css index 3f0f6fe..b9cb2dd 100644 --- a/css/spinners/1-rotating-plane.css +++ b/css/spinners/1-rotating-plane.css @@ -1,7 +1,7 @@ /* * Usage: * - *
+
* */ .sk-rotating-plane { diff --git a/css/spinners/10-fading-circle.css b/css/spinners/10-fading-circle.css index 7f53f23..b8138cb 100644 --- a/css/spinners/10-fading-circle.css +++ b/css/spinners/10-fading-circle.css @@ -1,20 +1,20 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
* */ .sk-fading-circle { diff --git a/css/spinners/11-folding-cube.css b/css/spinners/11-folding-cube.css index d8d645f..c41a519 100644 --- a/css/spinners/11-folding-cube.css +++ b/css/spinners/11-folding-cube.css @@ -1,12 +1,12 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
+
+
+
+
+
+
* */ .sk-folding-cube { diff --git a/css/spinners/2-double-bounce.css b/css/spinners/2-double-bounce.css index 50027b4..2e78662 100644 --- a/css/spinners/2-double-bounce.css +++ b/css/spinners/2-double-bounce.css @@ -1,10 +1,10 @@ /* * Usage: * - *
- *
- *
- *
+
+
+
+
* */ .sk-double-bounce { diff --git a/css/spinners/3-wave.css b/css/spinners/3-wave.css index d5b0912..5cfa871 100644 --- a/css/spinners/3-wave.css +++ b/css/spinners/3-wave.css @@ -1,13 +1,13 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
* */ .sk-wave { diff --git a/css/spinners/4-wandering-cubes.css b/css/spinners/4-wandering-cubes.css index e19eebb..b67483f 100644 --- a/css/spinners/4-wandering-cubes.css +++ b/css/spinners/4-wandering-cubes.css @@ -1,10 +1,10 @@ /* * Usage: * - *
- *
- *
- *
+
+
+
+
* */ .sk-wandering-cubes { diff --git a/css/spinners/5-pulse.css b/css/spinners/5-pulse.css index 1257ae3..6e4e8f4 100644 --- a/css/spinners/5-pulse.css +++ b/css/spinners/5-pulse.css @@ -1,7 +1,7 @@ /* * Usage: * - * + * */ .sk-spinner-pulse { diff --git a/css/spinners/6-chasing-dots.css b/css/spinners/6-chasing-dots.css index ce6a6ca..033e3e6 100644 --- a/css/spinners/6-chasing-dots.css +++ b/css/spinners/6-chasing-dots.css @@ -1,10 +1,10 @@ /* * Usage: * - *
- *
- *
- *
+
+
+
+
* */ .sk-chasing-dots { diff --git a/css/spinners/7-three-bounce.css b/css/spinners/7-three-bounce.css index 8200d5d..a7c8e96 100644 --- a/css/spinners/7-three-bounce.css +++ b/css/spinners/7-three-bounce.css @@ -1,11 +1,11 @@ /* * Usage: * - *
- *
- *
- *
- *
+
+
+
+
+
* */ .sk-three-bounce { diff --git a/css/spinners/8-circle.css b/css/spinners/8-circle.css index a338f1d..fb12126 100644 --- a/css/spinners/8-circle.css +++ b/css/spinners/8-circle.css @@ -1,20 +1,20 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
* */ .sk-circle { diff --git a/css/spinners/9-cube-grid.css b/css/spinners/9-cube-grid.css index 0bc7518..a2ec2cc 100644 --- a/css/spinners/9-cube-grid.css +++ b/css/spinners/9-cube-grid.css @@ -1,17 +1,17 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
+
+
+
+
* */ .sk-cube-grid { @@ -25,8 +25,8 @@ * 7 8 9 */ } .sk-cube-grid .sk-cube { - width: 33%; - height: 33%; + width: 33.33%; + height: 33.33%; background-color: #333; float: left; -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; diff --git a/examples/1-rotating-plane.html b/examples/1-rotating-plane.html index 50ed4b8..4357808 100644 --- a/examples/1-rotating-plane.html +++ b/examples/1-rotating-plane.html @@ -6,7 +6,7 @@ /* * Usage: * - *
+
* */ .sk-rotating-plane { @@ -44,6 +44,6 @@ -
+
\ No newline at end of file diff --git a/examples/10-fading-circle.html b/examples/10-fading-circle.html index 9427990..5df235a 100644 --- a/examples/10-fading-circle.html +++ b/examples/10-fading-circle.html @@ -6,20 +6,20 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
* */ .sk-fading-circle { @@ -138,19 +138,19 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/examples/11-folding-cube.html b/examples/11-folding-cube.html index b4ebaff..f6beb61 100644 --- a/examples/11-folding-cube.html +++ b/examples/11-folding-cube.html @@ -6,12 +6,12 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
+
+
+
+
+
+
* */ .sk-folding-cube { @@ -94,11 +94,11 @@ -
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file diff --git a/examples/2-double-bounce.html b/examples/2-double-bounce.html index 71c2038..ec378d0 100644 --- a/examples/2-double-bounce.html +++ b/examples/2-double-bounce.html @@ -6,10 +6,10 @@ /* * Usage: * - *
- *
- *
- *
+
+
+
+
* */ .sk-double-bounce { @@ -53,9 +53,9 @@ -
-
-
-
+
+
+
+
\ No newline at end of file diff --git a/examples/3-wave.html b/examples/3-wave.html index 7ea2258..ad4ed19 100644 --- a/examples/3-wave.html +++ b/examples/3-wave.html @@ -6,13 +6,13 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
* */ .sk-wave { @@ -65,12 +65,12 @@ -
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/examples/4-wandering-cubes.html b/examples/4-wandering-cubes.html index 21ffa95..f77cb2f 100644 --- a/examples/4-wandering-cubes.html +++ b/examples/4-wandering-cubes.html @@ -6,10 +6,10 @@ /* * Usage: * - *
- *
- *
- *
+
+
+
+
* */ .sk-wandering-cubes { @@ -77,9 +77,9 @@ -
-
-
-
+
+
+
+
\ No newline at end of file diff --git a/examples/5-pulse.html b/examples/5-pulse.html index e1381ec..0390ee2 100644 --- a/examples/5-pulse.html +++ b/examples/5-pulse.html @@ -6,7 +6,7 @@ /* * Usage: * - * + * */ .sk-spinner-pulse { @@ -41,6 +41,6 @@ - + \ No newline at end of file diff --git a/examples/6-chasing-dots.html b/examples/6-chasing-dots.html index e601878..adc63c4 100644 --- a/examples/6-chasing-dots.html +++ b/examples/6-chasing-dots.html @@ -6,10 +6,10 @@ /* * Usage: * - *
- *
- *
- *
+
+
+
+
* */ .sk-chasing-dots { @@ -67,9 +67,9 @@ -
-
-
-
+
+
+
+
\ No newline at end of file diff --git a/examples/7-three-bounce.html b/examples/7-three-bounce.html index 4a1cc24..fc56337 100644 --- a/examples/7-three-bounce.html +++ b/examples/7-three-bounce.html @@ -6,11 +6,11 @@ /* * Usage: * - *
- *
- *
- *
- *
+
+
+
+
+
* */ .sk-three-bounce { @@ -53,10 +53,10 @@ -
-
-
-
-
+
+
+
+
+
\ No newline at end of file diff --git a/examples/8-circle.html b/examples/8-circle.html index e21915b..028f946 100644 --- a/examples/8-circle.html +++ b/examples/8-circle.html @@ -6,20 +6,20 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
* */ .sk-circle { @@ -142,19 +142,19 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/examples/9-cube-grid.html b/examples/9-cube-grid.html index 476c192..05578ee 100644 --- a/examples/9-cube-grid.html +++ b/examples/9-cube-grid.html @@ -6,17 +6,17 @@ /* * Usage: * - *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+
+
+
+
+
+
+
+
+
+
+
* */ .sk-cube-grid { @@ -30,8 +30,8 @@ * 7 8 9 */ } .sk-cube-grid .sk-cube { - width: 33%; - height: 33%; + width: 33.33%; + height: 33.33%; background-color: #333; float: left; -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; @@ -85,16 +85,16 @@ -
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file From e09b6979e68620e1062b37cbcf4d15a88600c13f Mon Sep 17 00:00:00 2001 From: Tobias Ahlin Date: Mon, 23 Nov 2015 14:23:23 +0100 Subject: [PATCH 3/3] Prepare for release of 1.2.4 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 161449f..86033a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.2.4 + +* Fixed: Borked gulp script (#106) +* Fixed: Moved changes made in CSS, to SCSS + # 1.2.3 * Fixed: More exact (33% -> 33.33%) cube dimensions for cube grid spinner diff --git a/package.json b/package.json index ffde7fa..37c010a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spinkit", - "version": "1.2.3", + "version": "1.2.4", "description": "A collection of loading indicators animated with CSS", "keywords": [ "css",