Skip to content

Commit

Permalink
Merge pull request #107 from tobiasahlin/move-patches-to-scss
Browse files Browse the repository at this point in the history
Release 1.2.4
  • Loading branch information
tobiasahlin committed Nov 23, 2015
2 parents c570abe + e09b697 commit 0d58e40
Show file tree
Hide file tree
Showing 26 changed files with 226 additions and 221 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion css/spinkit.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Usage:
*
<div class="sk-rotating-plane"></div>
<div class="sk-rotating-plane"></div>
*
*/
.sk-rotating-plane {
Expand Down
2 changes: 1 addition & 1 deletion css/spinners/1-rotating-plane.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Usage:
*
* <div class="sk-rotating-plane"></div>
<div class="sk-rotating-plane"></div>
*
*/
.sk-rotating-plane {
Expand Down
28 changes: 14 additions & 14 deletions css/spinners/10-fading-circle.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*
* Usage:
*
* <div class="sk-fading-circle">
* <div class="sk-circle1 sk-circle"></div>
* <div class="sk-circle2 sk-circle"></div>
* <div class="sk-circle3 sk-circle"></div>
* <div class="sk-circle4 sk-circle"></div>
* <div class="sk-circle5 sk-circle"></div>
* <div class="sk-circle6 sk-circle"></div>
* <div class="sk-circle7 sk-circle"></div>
* <div class="sk-circle8 sk-circle"></div>
* <div class="sk-circle9 sk-circle"></div>
* <div class="sk-circle10 sk-circle"></div>
* <div class="sk-circle11 sk-circle"></div>
* <div class="sk-circle12 sk-circle"></div>
* </div>
<div class="sk-fading-circle">
<div class="sk-circle1 sk-circle"></div>
<div class="sk-circle2 sk-circle"></div>
<div class="sk-circle3 sk-circle"></div>
<div class="sk-circle4 sk-circle"></div>
<div class="sk-circle5 sk-circle"></div>
<div class="sk-circle6 sk-circle"></div>
<div class="sk-circle7 sk-circle"></div>
<div class="sk-circle8 sk-circle"></div>
<div class="sk-circle9 sk-circle"></div>
<div class="sk-circle10 sk-circle"></div>
<div class="sk-circle11 sk-circle"></div>
<div class="sk-circle12 sk-circle"></div>
</div>
*
*/
.sk-fading-circle {
Expand Down
12 changes: 6 additions & 6 deletions css/spinners/11-folding-cube.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Usage:
*
* <div class="sk-folding-cube">
* <div class="sk-cube1 sk-cube"></div>
* <div class="sk-cube2 sk-cube"></div>
* <div class="sk-cube4 sk-cube"></div>
* <div class="sk-cube3 sk-cube"></div>
* </div>
<div class="sk-folding-cube">
<div class="sk-cube1 sk-cube"></div>
<div class="sk-cube2 sk-cube"></div>
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
*
*/
.sk-folding-cube {
Expand Down
8 changes: 4 additions & 4 deletions css/spinners/2-double-bounce.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* Usage:
*
* <div class="sk-double-bounce">
* <div class="sk-child sk-double-bounce1"></div>
* <div class="sk-child sk-double-bounce2"></div>
* </div>
<div class="sk-double-bounce">
<div class="sk-child sk-double-bounce1"></div>
<div class="sk-child sk-double-bounce2"></div>
</div>
*
*/
.sk-double-bounce {
Expand Down
14 changes: 7 additions & 7 deletions css/spinners/3-wave.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*
* Usage:
*
* <div class="sk-wave">
* <div class="sk-rect sk-rect1"></div>
* <div class="sk-rect sk-rect2"></div>
* <div class="sk-rect sk-rect3"></div>
* <div class="sk-rect sk-rect4"></div>
* <div class="sk-rect sk-rect5"></div>
* </div>
<div class="sk-wave">
<div class="sk-rect sk-rect1"></div>
<div class="sk-rect sk-rect2"></div>
<div class="sk-rect sk-rect3"></div>
<div class="sk-rect sk-rect4"></div>
<div class="sk-rect sk-rect5"></div>
</div>
*
*/
.sk-wave {
Expand Down
8 changes: 4 additions & 4 deletions css/spinners/4-wandering-cubes.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* Usage:
*
* <div class="sk-wandering-cubes">
* <div class="sk-cube sk-cube1"></div>
* <div class="sk-cube sk-cube2"></div>
* </div>
<div class="sk-wandering-cubes">
<div class="sk-cube sk-cube1"></div>
<div class="sk-cube sk-cube2"></div>
</div>
*
*/
.sk-wandering-cubes {
Expand Down
2 changes: 1 addition & 1 deletion css/spinners/5-pulse.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Usage:
*
* <div class="sk-spinner sk-spinner-pulse"></div>
<div class="sk-spinner sk-spinner-pulse"></div>
*
*/
.sk-spinner-pulse {
Expand Down
8 changes: 4 additions & 4 deletions css/spinners/6-chasing-dots.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*
* Usage:
*
* <div class="sk-chasing-dots">
* <div class="sk-child sk-dot1"></div>
* <div class="sk-child sk-dot2"></div>
* </div>
<div class="sk-chasing-dots">
<div class="sk-child sk-dot1"></div>
<div class="sk-child sk-dot2"></div>
</div>
*
*/
.sk-chasing-dots {
Expand Down
10 changes: 5 additions & 5 deletions css/spinners/7-three-bounce.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* Usage:
*
* <div class="sk-three-bounce">
* <div class="sk-child sk-bounce1"></div>
* <div class="sk-child sk-bounce2"></div>
* <div class="sk-child sk-bounce3"></div>
* </div>
<div class="sk-three-bounce">
<div class="sk-child sk-bounce1"></div>
<div class="sk-child sk-bounce2"></div>
<div class="sk-child sk-bounce3"></div>
</div>
*
*/
.sk-three-bounce {
Expand Down
28 changes: 14 additions & 14 deletions css/spinners/8-circle.css
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*
* Usage:
*
* <div class="sk-circle">
* <div class="sk-circle1 sk-child"></div>
* <div class="sk-circle2 sk-child"></div>
* <div class="sk-circle3 sk-child"></div>
* <div class="sk-circle4 sk-child"></div>
* <div class="sk-circle5 sk-child"></div>
* <div class="sk-circle6 sk-child"></div>
* <div class="sk-circle7 sk-child"></div>
* <div class="sk-circle8 sk-child"></div>
* <div class="sk-circle9 sk-child"></div>
* <div class="sk-circle10 sk-child"></div>
* <div class="sk-circle11 sk-child"></div>
* <div class="sk-circle12 sk-child"></div>
* </div>
<div class="sk-circle">
<div class="sk-circle1 sk-child"></div>
<div class="sk-circle2 sk-child"></div>
<div class="sk-circle3 sk-child"></div>
<div class="sk-circle4 sk-child"></div>
<div class="sk-circle5 sk-child"></div>
<div class="sk-circle6 sk-child"></div>
<div class="sk-circle7 sk-child"></div>
<div class="sk-circle8 sk-child"></div>
<div class="sk-circle9 sk-child"></div>
<div class="sk-circle10 sk-child"></div>
<div class="sk-circle11 sk-child"></div>
<div class="sk-circle12 sk-child"></div>
</div>
*
*/
.sk-circle {
Expand Down
26 changes: 13 additions & 13 deletions css/spinners/9-cube-grid.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/*
* Usage:
*
* <div class="sk-cube-grid">
* <div class="sk-cube sk-cube1"></div>
* <div class="sk-cube sk-cube2"></div>
* <div class="sk-cube sk-cube3"></div>
* <div class="sk-cube sk-cube4"></div>
* <div class="sk-cube sk-cube5"></div>
* <div class="sk-cube sk-cube6"></div>
* <div class="sk-cube sk-cube7"></div>
* <div class="sk-cube sk-cube8"></div>
* <div class="sk-cube sk-cube9"></div>
* </div>
<div class="sk-cube-grid">
<div class="sk-cube sk-cube1"></div>
<div class="sk-cube sk-cube2"></div>
<div class="sk-cube sk-cube3"></div>
<div class="sk-cube sk-cube4"></div>
<div class="sk-cube sk-cube5"></div>
<div class="sk-cube sk-cube6"></div>
<div class="sk-cube sk-cube7"></div>
<div class="sk-cube sk-cube8"></div>
<div class="sk-cube sk-cube9"></div>
</div>
*
*/
.sk-cube-grid {
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions examples/1-rotating-plane.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/*
* Usage:
*
* <div class="sk-rotating-plane"></div>
<div class="sk-rotating-plane"></div>
*
*/
.sk-rotating-plane {
Expand Down Expand Up @@ -44,6 +44,6 @@
<body>


<div class="sk-rotating-plane"></div>
<div class="sk-rotating-plane"></div>
</body>
</html>
56 changes: 28 additions & 28 deletions examples/10-fading-circle.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
/*
* Usage:
*
* <div class="sk-fading-circle">
* <div class="sk-circle1 sk-circle"></div>
* <div class="sk-circle2 sk-circle"></div>
* <div class="sk-circle3 sk-circle"></div>
* <div class="sk-circle4 sk-circle"></div>
* <div class="sk-circle5 sk-circle"></div>
* <div class="sk-circle6 sk-circle"></div>
* <div class="sk-circle7 sk-circle"></div>
* <div class="sk-circle8 sk-circle"></div>
* <div class="sk-circle9 sk-circle"></div>
* <div class="sk-circle10 sk-circle"></div>
* <div class="sk-circle11 sk-circle"></div>
* <div class="sk-circle12 sk-circle"></div>
* </div>
<div class="sk-fading-circle">
<div class="sk-circle1 sk-circle"></div>
<div class="sk-circle2 sk-circle"></div>
<div class="sk-circle3 sk-circle"></div>
<div class="sk-circle4 sk-circle"></div>
<div class="sk-circle5 sk-circle"></div>
<div class="sk-circle6 sk-circle"></div>
<div class="sk-circle7 sk-circle"></div>
<div class="sk-circle8 sk-circle"></div>
<div class="sk-circle9 sk-circle"></div>
<div class="sk-circle10 sk-circle"></div>
<div class="sk-circle11 sk-circle"></div>
<div class="sk-circle12 sk-circle"></div>
</div>
*
*/
.sk-fading-circle {
Expand Down Expand Up @@ -138,19 +138,19 @@
<body>


<div class="sk-fading-circle">
<div class="sk-circle1 sk-circle"></div>
<div class="sk-circle2 sk-circle"></div>
<div class="sk-circle3 sk-circle"></div>
<div class="sk-circle4 sk-circle"></div>
<div class="sk-circle5 sk-circle"></div>
<div class="sk-circle6 sk-circle"></div>
<div class="sk-circle7 sk-circle"></div>
<div class="sk-circle8 sk-circle"></div>
<div class="sk-circle9 sk-circle"></div>
<div class="sk-circle10 sk-circle"></div>
<div class="sk-circle11 sk-circle"></div>
<div class="sk-circle12 sk-circle"></div>
</div>
<div class="sk-fading-circle">
<div class="sk-circle1 sk-circle"></div>
<div class="sk-circle2 sk-circle"></div>
<div class="sk-circle3 sk-circle"></div>
<div class="sk-circle4 sk-circle"></div>
<div class="sk-circle5 sk-circle"></div>
<div class="sk-circle6 sk-circle"></div>
<div class="sk-circle7 sk-circle"></div>
<div class="sk-circle8 sk-circle"></div>
<div class="sk-circle9 sk-circle"></div>
<div class="sk-circle10 sk-circle"></div>
<div class="sk-circle11 sk-circle"></div>
<div class="sk-circle12 sk-circle"></div>
</div>
</body>
</html>
24 changes: 12 additions & 12 deletions examples/11-folding-cube.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
/*
* Usage:
*
* <div class="sk-folding-cube">
* <div class="sk-cube1 sk-cube"></div>
* <div class="sk-cube2 sk-cube"></div>
* <div class="sk-cube4 sk-cube"></div>
* <div class="sk-cube3 sk-cube"></div>
* </div>
<div class="sk-folding-cube">
<div class="sk-cube1 sk-cube"></div>
<div class="sk-cube2 sk-cube"></div>
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
*
*/
.sk-folding-cube {
Expand Down Expand Up @@ -94,11 +94,11 @@
<body>


<div class="sk-folding-cube">
<div class="sk-cube1 sk-cube"></div>
<div class="sk-cube2 sk-cube"></div>
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
<div class="sk-folding-cube">
<div class="sk-cube1 sk-cube"></div>
<div class="sk-cube2 sk-cube"></div>
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
</body>
</html>
Loading

0 comments on commit 0d58e40

Please sign in to comment.