diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
| commit | 5273559ca101d8ae4a55104f18081ab011e5068c (patch) | |
| tree | f152b638101b224ffc59ed000e384b651915266a /webapp/sass/utils/_animations.scss | |
| parent | 074f15f761ff50388b58e35e8354c139c06a807e (diff) | |
| parent | 128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff) | |
| download | chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2 chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip | |
Fixing merge
Diffstat (limited to 'webapp/sass/utils/_animations.scss')
| -rw-r--r-- | webapp/sass/utils/_animations.scss | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/webapp/sass/utils/_animations.scss b/webapp/sass/utils/_animations.scss index 767e30847..ffdbcb219 100644 --- a/webapp/sass/utils/_animations.scss +++ b/webapp/sass/utils/_animations.scss @@ -1,19 +1,21 @@ @charset 'UTF-8'; -@-webkit-keyframes spin2 { +@keyframes spin { from { - -webkit-transform: rotate(0deg); + transform: scale(1) rotate(0deg); } + to { - -webkit-transform: rotate(360deg); + transform: scale(1) rotate(360deg); } } -@keyframes spin { +@keyframes highlight { from { - transform: scale(1) rotate(0deg); + @include alpha-property(background, $yellow, .5); } + to { - transform: scale(1) rotate(360deg); + background: none; } } |