diff options
| author | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
|---|---|---|
| committer | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
| commit | f7e9ee56d2ed5447f59e5548f005fabdab2f0a72 (patch) | |
| tree | a16300fa62e68b3310ae96e36dba65981f0024ef /demo/src/sass/lib/animation.scss | |
| parent | 22af7f16ea4a4269321d29242d63ec23718c92da (diff) | |
| parent | 423b7b276f1572eb666de32094a9aacd32e87d18 (diff) | |
| download | plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.lz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.xz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.zip | |
Fix merge conflicts
Diffstat (limited to 'demo/src/sass/lib/animation.scss')
| -rw-r--r-- | demo/src/sass/lib/animation.scss | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/demo/src/sass/lib/animation.scss b/demo/src/sass/lib/animation.scss index 64eb5595..cc18d59b 100644 --- a/demo/src/sass/lib/animation.scss +++ b/demo/src/sass/lib/animation.scss @@ -4,24 +4,24 @@ // Fade @keyframes fadein { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } } @keyframes shrinkHide { - 0% { - opacity: 0.5; - width: 38px; - } - 20% { - width: 45px; - } - 100% { - opacity: 0; - width: 0; - } + 0% { + opacity: 0.5; + width: 38px; + } + 20% { + width: 45px; + } + 100% { + opacity: 0; + width: 0; + } } |