Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed and improved circular progess animation on about section #850

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions assets/styles/sections/about.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,25 @@ $progress-bar-colors: (
}

@mixin circular-progress-animation-breakpoints() {
$progress: 50;
$progress: 0;
$duration: 0;
$delay: 1.8;

@for $i from 1 through 10 {
@for $i from 0 through 20 {
.circular-progress-percentage-#{$progress} {
animation: circular-loading-#{$progress} #{$duration}s linear forwards 1.8s;
}
.circular-progress-percentage-#{$progress}-delay {
animation-delay: #{$delay}s;
}
$progress: $progress + 5;
$duration: $duration + 0.18;
$delay: $duration + 1.8;
}
}

@mixin circular-progress-animation-keyframes($progress, $degree, $keyframes) {
@for $i from 1 through $keyframes {
@for $i from 0 through $keyframes {
@keyframes circular-loading-#{$progress} {
0% {
transform: rotate(0);
Expand Down Expand Up @@ -122,7 +127,6 @@ $progress-bar-colors: (
border-bottom-left-radius: 80px;
border-right: 0;
transform-origin: center right;
animation: circular-loading-1 1.8s linear forwards;
}
}
.circular-progress-value {
Expand All @@ -144,8 +148,7 @@ $progress-bar-colors: (
}
@include circular-progress-bar-color();
@include circular-progress-animation-breakpoints();
@include circular-progress-animation-keyframes($progress: 50, $degree: 0, $keyframes: 10);
@include circular-progress-animation-keyframes($progress: 1, $degree: 180, $keyframes: 5);
@include circular-progress-animation-keyframes($progress: 0, $degree: 0, $keyframes: 20);
}

@include media('<=large') {
Expand Down
10 changes: 8 additions & 2 deletions layouts/partials/misc/badge.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,24 @@
{{ if hasPrefix .color "#"}}
{{ $predefinedColor = false }}
{{ end }}
{{ $leftProgress := 0 }}
{{ $rightProgress := .percentage }}
{{ if ge .percentage 50 }}
{{ $rightProgress = 50 }}
{{ $leftProgress = sub .percentage 50 }}
{{ end }}
<div class="circular-progress {{if $predefinedColor}}{{ .color }}{{end}}">
<span class="circular-progress-left">
<span
class="circular-progress-bar circular-progress-percentage-{{ .percentage }}"
class="circular-progress-bar circular-progress-percentage-{{ $leftProgress }} circular-progress-percentage-50-delay"
{{ if not $predefinedColor }}
style="border-color: {{.color}};"
{{ end }}
></span>
</span>
<span class="circular-progress-right">
<span
class="circular-progress-bar"
class="circular-progress-bar circular-progress-percentage-{{ $rightProgress }}"
{{ if not $predefinedColor }}
style="border-color: {{.color}};"
{{ end }}
Expand Down
Loading