Skip to content

Commit

Permalink
Fixing circle conflict bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@Urigo
Urigo committed Oct 10, 2014
1 parent e85bd86 commit d122126
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 65 deletions.
24 changes: 12 additions & 12 deletions build/angular-spinkit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,18 @@ angular.module('angular-spinkit').run(['$templateCache', function($templateCache

$templateCache.put('src/templates/fadingCircleSpinner.html',
"<div class=\"fading-circle-spinner\">\n" +
" <div class=\"circle1 circle\"></div>\n" +
" <div class=\"circle2 circle\"></div>\n" +
" <div class=\"circle3 circle\"></div>\n" +
" <div class=\"circle4 circle\"></div>\n" +
" <div class=\"circle5 circle\"></div>\n" +
" <div class=\"circle6 circle\"></div>\n" +
" <div class=\"circle7 circle\"></div>\n" +
" <div class=\"circle8 circle\"></div>\n" +
" <div class=\"circle9 circle\"></div>\n" +
" <div class=\"circle10 circle\"></div>\n" +
" <div class=\"circle11 circle\"></div>\n" +
" <div class=\"circle12 circle\"></div>\n" +
" <div class=\"fading-circle1 fading-circle\"></div>\n" +
" <div class=\"fading-circle2 fading-circle\"></div>\n" +
" <div class=\"fading-circle3 fading-circle\"></div>\n" +
" <div class=\"fading-circle4 fading-circle\"></div>\n" +
" <div class=\"fading-circle5 fading-circle\"></div>\n" +
" <div class=\"fading-circle6 fading-circle\"></div>\n" +
" <div class=\"fading-circle7 fading-circle\"></div>\n" +
" <div class=\"fading-circle8 fading-circle\"></div>\n" +
" <div class=\"fading-circle9 fading-circle\"></div>\n" +
" <div class=\"fading-circle10 fading-circle\"></div>\n" +
" <div class=\"fading-circle11 fading-circle\"></div>\n" +
" <div class=\"fading-circle12 fading-circle\"></div>\n" +
"</div>"
);

Expand Down
4 changes: 2 additions & 2 deletions build/angular-spinkit.min.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/angular-spinkit.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions build/templates.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ angular.module('angular-spinkit').run(['$templateCache', function($templateCache

$templateCache.put('src/templates/fadingCircleSpinner.html',
"<div class=\"fading-circle-spinner\">\n" +
" <div class=\"circle1 circle\"></div>\n" +
" <div class=\"circle2 circle\"></div>\n" +
" <div class=\"circle3 circle\"></div>\n" +
" <div class=\"circle4 circle\"></div>\n" +
" <div class=\"circle5 circle\"></div>\n" +
" <div class=\"circle6 circle\"></div>\n" +
" <div class=\"circle7 circle\"></div>\n" +
" <div class=\"circle8 circle\"></div>\n" +
" <div class=\"circle9 circle\"></div>\n" +
" <div class=\"circle10 circle\"></div>\n" +
" <div class=\"circle11 circle\"></div>\n" +
" <div class=\"circle12 circle\"></div>\n" +
" <div class=\"fading-circle1 fading-circle\"></div>\n" +
" <div class=\"fading-circle2 fading-circle\"></div>\n" +
" <div class=\"fading-circle3 fading-circle\"></div>\n" +
" <div class=\"fading-circle4 fading-circle\"></div>\n" +
" <div class=\"fading-circle5 fading-circle\"></div>\n" +
" <div class=\"fading-circle6 fading-circle\"></div>\n" +
" <div class=\"fading-circle7 fading-circle\"></div>\n" +
" <div class=\"fading-circle8 fading-circle\"></div>\n" +
" <div class=\"fading-circle9 fading-circle\"></div>\n" +
" <div class=\"fading-circle10 fading-circle\"></div>\n" +
" <div class=\"fading-circle11 fading-circle\"></div>\n" +
" <div class=\"fading-circle12 fading-circle\"></div>\n" +
"</div>"
);

Expand Down
50 changes: 25 additions & 25 deletions src/angular-spinkit.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,15 +458,15 @@
position: relative;
}

.circle {
.fading-circle {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
}

.circle:before {
.fading-circle:before {
content: '';
display: block;
margin: 0 auto;
Expand All @@ -479,29 +479,29 @@
animation: fadedelay 1.2s infinite ease-in-out both;
}

.circle2 { transform: rotate(30deg); -webkit-transform: rotate(30deg) }
.circle3 { transform: rotate(60deg); -webkit-transform: rotate(60deg) }
.circle4 { transform: rotate(90deg); -webkit-transform: rotate(90deg) }
.circle5 { transform: rotate(120deg); -webkit-transform: rotate(120deg) }
.circle6 { transform: rotate(150deg); -webkit-transform: rotate(150deg) }
.circle7 { transform: rotate(180deg); -webkit-transform: rotate(180deg) }
.circle8 { transform: rotate(210deg); -webkit-transform: rotate(210deg) }
.circle9 { transform: rotate(240deg); -webkit-transform: rotate(240deg) }
.circle10 { transform: rotate(270deg); -webkit-transform: rotate(270deg) }
.circle11 { transform: rotate(300deg); -webkit-transform: rotate(300deg) }
.circle12 { transform: rotate(330deg); -webkit-transform: rotate(330deg) }

.circle2:before { animation-delay: -1.1s; -webkit-animation-delay: -1.1s }
.circle3:before { animation-delay: -1.0s; -webkit-animation-delay: -1.0s }
.circle4:before { animation-delay: -0.9s; -webkit-animation-delay: -0.9s }
.circle5:before { animation-delay: -0.8s; -webkit-animation-delay: -0.8s }
.circle6:before { animation-delay: -0.7s; -webkit-animation-delay: -0.7s }
.circle7:before { animation-delay: -0.6s; -webkit-animation-delay: -0.6s }
.circle8:before { animation-delay: -0.5s; -webkit-animation-delay: -0.5s }
.circle9:before { animation-delay: -0.4s; -webkit-animation-delay: -0.4s }
.circle10:before { animation-delay: -0.3s; -webkit-animation-delay: -0.3s }
.circle11:before { animation-delay: -0.2s; -webkit-animation-delay: -0.2s }
.circle12:before { animation-delay: -0.1s; -webkit-animation-delay: -0.1s }
.fading-circle2 { transform: rotate(30deg); -webkit-transform: rotate(30deg) }
.fading-circle3 { transform: rotate(60deg); -webkit-transform: rotate(60deg) }
.fading-circle4 { transform: rotate(90deg); -webkit-transform: rotate(90deg) }
.fading-circle5 { transform: rotate(120deg); -webkit-transform: rotate(120deg) }
.fading-circle6 { transform: rotate(150deg); -webkit-transform: rotate(150deg) }
.fading-circle7 { transform: rotate(180deg); -webkit-transform: rotate(180deg) }
.fading-circle8 { transform: rotate(210deg); -webkit-transform: rotate(210deg) }
.fading-circle9 { transform: rotate(240deg); -webkit-transform: rotate(240deg) }
.fading-circle10 { transform: rotate(270deg); -webkit-transform: rotate(270deg) }
.fading-circle11 { transform: rotate(300deg); -webkit-transform: rotate(300deg) }
.fading-circle12 { transform: rotate(330deg); -webkit-transform: rotate(330deg) }

.fading-circle2:before { animation-delay: -1.1s; -webkit-animation-delay: -1.1s }
.fading-circle3:before { animation-delay: -1.0s; -webkit-animation-delay: -1.0s }
.fading-circle4:before { animation-delay: -0.9s; -webkit-animation-delay: -0.9s }
.fading-circle5:before { animation-delay: -0.8s; -webkit-animation-delay: -0.8s }
.fading-circle6:before { animation-delay: -0.7s; -webkit-animation-delay: -0.7s }
.fading-circle7:before { animation-delay: -0.6s; -webkit-animation-delay: -0.6s }
.fading-circle8:before { animation-delay: -0.5s; -webkit-animation-delay: -0.5s }
.fading-circle9:before { animation-delay: -0.4s; -webkit-animation-delay: -0.4s }
.fading-circle10:before { animation-delay: -0.3s; -webkit-animation-delay: -0.3s }
.fading-circle11:before { animation-delay: -0.2s; -webkit-animation-delay: -0.2s }
.fading-circle12:before { animation-delay: -0.1s; -webkit-animation-delay: -0.1s }

@-webkit-keyframes fadedelay {
0%, 39%, 100% { opacity: 0 }
Expand Down
24 changes: 12 additions & 12 deletions src/templates/fadingCircleSpinner.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="fading-circle-spinner">
<div class="circle1 circle"></div>
<div class="circle2 circle"></div>
<div class="circle3 circle"></div>
<div class="circle4 circle"></div>
<div class="circle5 circle"></div>
<div class="circle6 circle"></div>
<div class="circle7 circle"></div>
<div class="circle8 circle"></div>
<div class="circle9 circle"></div>
<div class="circle10 circle"></div>
<div class="circle11 circle"></div>
<div class="circle12 circle"></div>
<div class="fading-circle1 fading-circle"></div>
<div class="fading-circle2 fading-circle"></div>
<div class="fading-circle3 fading-circle"></div>
<div class="fading-circle4 fading-circle"></div>
<div class="fading-circle5 fading-circle"></div>
<div class="fading-circle6 fading-circle"></div>
<div class="fading-circle7 fading-circle"></div>
<div class="fading-circle8 fading-circle"></div>
<div class="fading-circle9 fading-circle"></div>
<div class="fading-circle10 fading-circle"></div>
<div class="fading-circle11 fading-circle"></div>
<div class="fading-circle12 fading-circle"></div>
</div>

0 comments on commit d122126

Please sign in to comment.