Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
GitLab Community Edition
GitLab Community Edition
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 11,041
    • Issues 11,041
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 666
    • Merge Requests 666
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • GitLab.org
  • GitLab Community EditionGitLab Community Edition
  • Merge Requests
  • !10130

Merged
Opened Mar 21, 2017 by Dimitrie Hoekstra@dimitrieh 1 of 9 tasks completed1/9 tasks
  • Report abuse
Report abuse

Award emoji button smiley animation

What does this MR do?

It adds a changing smiley (neutral to positive) animation to the new award emoji button.

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

to motivate users to use award emoji

Screenshots (if relevant)

2017-03-22_12.14.40

2017-03-22_12.34.48

Does this MR meet the acceptance criteria?

  • Changelog entry added, if necessary
  • Documentation created/updated
  • API support added
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Conform by the merge request performance guides
  • Conform by the style guides
  • Branch has no merge conflicts with master (if it does - rebase it please)
  • Squashed related commits together

What are the relevant issue numbers?

cc: @victorwu @MadLittleMods @tauriedavis @annabeldunstone

  • Discussion 22
  • Commits 10
  • Pipelines 10
  • Changes 10
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Dimitrie Hoekstra @dimitrieh

    mentioned in merge request !10124 (merged)

    · Mar 21, 2017

    mentioned in merge request !10124 (merged)

    mentioned in merge request !10124
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh

    added 1 commit

    • 313bd185 - improved colors

    Compare with previous version

    · Mar 21, 2017

    added 1 commit

    • 313bd185 - improved colors

    Compare with previous version

    added 1 commit * 313bd185 - improved colors [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3501026&start_sha=c4d79b7cfa0a664d32957103e926e28594798d39)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Mar 21, 2017
    Developer

    just for fun :)

    just for fun :)
  • Dimitrie Hoekstra @dimitrieh commented · Mar 21, 2017
    Developer

    related to !10124 (merged) (will prob have merge conflicts with it)

    related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10124 (will prob have merge conflicts with it)
  • Dimitrie Hoekstra @dimitrieh

    assigned to @annabeldunstone

    · Mar 21, 2017

    assigned to @annabeldunstone

    assigned to @annabeldunstone
    Toggle commit list
  • Eric Eastwood 🌴 @MadLittleMods

    added ~1721114 label

    · Mar 22, 2017

    added ~1721114 label

    added ~1721114 label
    Toggle commit list
  • Annabel Gray @annabeldunstone commented · Mar 22, 2017
    Maintainer

    💙 Looooove this. We should make sure it goes back to the inactive state once you've selected an emoji though (right now it stays on the color icon). Also- were you able to test this in IE11 by any chance?
    emoji

    @dimitrieh are there any other places we can add these fun little interactions?

    :blue_heart: Looooove this. We should make sure it goes back to the inactive state once you've selected an emoji though (right now it stays on the color icon). Also- were you able to test this in IE11 by any chance? ![emoji](/uploads/d194ec54de85696b6150a283354662b4/emoji.gif) @dimitrieh are there any other places we can add these fun little interactions?
  • Dimitrie Hoekstra @dimitrieh

    added 19 commits

    • 313bd185...bd90f502 - 18 commits from branch master
    • 6140c2ed - Added award emoji animation and improved active state

    Compare with previous version

    · Mar 22, 2017

    added 19 commits

    • 313bd185...bd90f502 - 18 commits from branch master
    • 6140c2ed - Added award emoji animation and improved active state

    Compare with previous version

    added 19 commits * 313bd185...bd90f502 - 18 commits from branch `master` * 6140c2ed - Added award emoji animation and improved active state [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3510842&start_sha=313bd185992ac0119b6e2e6a06614b6598685af9)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh

    added 19 commits

    • 313bd185...bd90f502 - 18 commits from branch master
    • 6140c2ed - Added award emoji animation and improved active state

    Compare with previous version

    · Mar 22, 2017

    added 19 commits

    • 313bd185...bd90f502 - 18 commits from branch master
    • 6140c2ed - Added award emoji animation and improved active state

    Compare with previous version

    added 19 commits * 313bd185...bd90f502 - 18 commits from branch `master` * 6140c2ed - Added award emoji animation and improved active state [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3510872&start_sha=313bd185992ac0119b6e2e6a06614b6598685af9)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Mar 22, 2017
    Developer

    @annabeldunstone thanks :) this basically has taken inspiration from slack with

    2017-03-22_11.52.41

    Lots of places in the long run ^ the most prominent of all i think the "mark done" button.. which i had a slightly more difficult example for here: #24831 (comment 18867591)

    but let's keep this mr to itself.. and see if the effect will snowball into new places where we want this 😸

    right now it stays on the color icon

    that's a bug.. mmhm and it seems to be related to this:

    image

    the emoji button seems keep the is-active class even when its not active anymore.. which is weird. Probably a small thing in app/assets/javascripts/awards_handler.js.. could you perhaps take a look?

    rebased for changes with !10124 (merged)

    we have a small additional problem with the tooltip: 2017-03-22_12.12.05

    @annabeldunstone thanks :) this basically has taken inspiration from slack with ![2017-03-22_11.52.41](/uploads/6c34533d564c45156f05f66270f959b3/2017-03-22_11.52.41.gif) Lots of places in the long run ^^ the most prominent of all i think the "mark done" button.. which i had a slightly more difficult example for here: https://gitlab.com/gitlab-org/gitlab-ce/issues/24831#note_18867591 but let's keep this mr to itself.. and see if the effect will snowball into new places where we want this :smile_cat: > right now it stays on the color icon that's a bug.. mmhm and it seems to be related to this: ![image](/uploads/5b9e322a483bfa0e60725e7417af088d/image.png) the emoji button seems keep the `is-active` class even when its not active anymore.. which is weird. Probably a small thing in `app/assets/javascripts/awards_handler.js`.. could you perhaps take a look? rebased for changes with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10124 we have a small additional problem with the tooltip: ![2017-03-22_12.12.05](/uploads/06c001ffc6e6478d31679cdbd5ef5e68/2017-03-22_12.12.05.gif)
  • Dimitrie Hoekstra @dimitrieh

    added 1 commit

    • ec27474d - added same animation to award emoji in notes buttons

    Compare with previous version

    · Mar 22, 2017

    added 1 commit

    • ec27474d - added same animation to award emoji in notes buttons

    Compare with previous version

    added 1 commit * ec27474d - added same animation to award emoji in notes buttons [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3511227&start_sha=6140c2ed94a917852f389cb577d56d34a5d99ec4)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Mar 22, 2017
    Developer

    @annabeldunstone I added the same thing to the notes.. (couldn't leave those out of course!)

    2017-03-22_12.34.48

    though it has the same .is-active problem. I intentionally added the class .is-active to the list with things like :hover cause it then reacts in the same way as it does on slack.. the button stays active.. while the menu is open.. so its the script that should be fixed.

    @annabeldunstone I added the same thing to the notes.. (couldn't leave those out of course!) ![2017-03-22_12.34.48](/uploads/d0290503fd369615b702ba8bc25730c1/2017-03-22_12.34.48.gif) though it has the same `.is-active` problem. I intentionally added the class `.is-active` to the list with things like `:hover` cause it then reacts in the same way as it does on slack.. the button stays active.. while the menu is open.. so its the script that should be fixed.
  • Dimitrie Hoekstra @dimitrieh

    mentioned in issue #24831 (closed)

    · Mar 22, 2017

    mentioned in issue #24831 (closed)

    mentioned in issue #24831
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Mar 22, 2017
    Developer

    Also- were you able to test this in IE11 by any chance?

    seems to work the same way on ie11 win7! (tested with browserstack trial) ezgif.com-optimize

    Edited Mar 22, 2017 by Dimitrie Hoekstra
    > Also- were you able to test this in IE11 by any chance? seems to work the same way on ie11 win7! (tested with browserstack trial) [ezgif.com-optimize](/uploads/6032c0b75031b3365c59893ae26a8b4e/ezgif.com-optimize.gif)
  • Dimitrie Hoekstra @dimitrieh

    added 1 commit

    • d752e343 - fix linting

    Compare with previous version

    · Mar 22, 2017

    added 1 commit

    • d752e343 - fix linting

    Compare with previous version

    added 1 commit * d752e343 - fix linting [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3512849&start_sha=ec27474ddccef4a1a53523b0271709f9aade5dc5)
    Toggle commit list
  • Annabel Gray @annabeldunstone commented · Mar 22, 2017
    Maintainer

    the button stays active.. while the menu is open.. so its the script that should be fixed.

    @fatihacet do you know why this is happening? is-active shouldn't still be there if the menu is closed

    > the button stays active.. while the menu is open.. so its the script that should be fixed. @fatihacet do you know why this is happening? `is-active` shouldn't still be there if the menu is closed
  • Annabel Gray @annabeldunstone

    assigned to @fatihacet

    · Mar 22, 2017

    assigned to @fatihacet

    assigned to @fatihacet
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Mar 23, 2017
    Developer

    also note the small tooltip problem :)

    also note the small tooltip problem :)
  • Dimitrie Hoekstra @dimitrieh

    added 1 commit

    • f55e719e - added 3rd is-active smiley state to enhance animation

    Compare with previous version

    · Mar 23, 2017

    added 1 commit

    • f55e719e - added 3rd is-active smiley state to enhance animation

    Compare with previous version

    added 1 commit * f55e719e - added 3rd is-active smiley state to enhance animation [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3524777&start_sha=d752e3431ec08f0f572db3e725535c2526d7e27b)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Mar 23, 2017
    Developer

    small edit, which also hopefully fixes linting.. 3rd emoji state to improve on fidelity and satisfaction of animation when pressing the actual button and summoning the emoji menu 😄 (with this we are officially beyond the app that inspired this 🎱 )

    2017-03-23_01.28.04

    2017-03-23_01.28.45

    Edited Mar 23, 2017 by Dimitrie Hoekstra
    small edit, which also hopefully fixes linting.. 3rd emoji state to improve on fidelity and satisfaction of animation when pressing the actual button and summoning the emoji menu :smile: (with this we are officially beyond the app that inspired this :8ball: ) ![2017-03-23_01.28.04](/uploads/6e8bb7db7bca14bec50d095ff048c328/2017-03-23_01.28.04.gif) ![2017-03-23_01.28.45](/uploads/7a1fe9970b4a3ca6cf1c9f3e45d21f94/2017-03-23_01.28.45.gif)
  • Fatih Acet @fatihacet commented · Mar 27, 2017
    Maintainer

    !10130 (comment 26008276)

    @dimitrieh @annabeldunstone is this still a problem?

    https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130#note_26008276 @dimitrieh @annabeldunstone is this still a problem?
  • Dimitrie Hoekstra @dimitrieh commented · Mar 27, 2017
    Developer

    @fatihacet to my understanding it is, or would it be fixed by rebasing this on top of new changes on master since?

    @fatihacet to my understanding it is, or would it be fixed by rebasing this on top of new changes on master since?
  • Dimitrie Hoekstra @dimitrieh

    changed milestone to 9.1

    · Mar 28, 2017

    changed milestone to 9.1

    changed milestone to %35
    Toggle commit list
  • Fatih Acet @fatihacet commented · Mar 29, 2017
    Maintainer

    @dimitrieh I think it would be. Let me know if you need help from me.

    @dimitrieh I think it would be. Let me know if you need help from me.
  • Dimitrie Hoekstra @dimitrieh

    added 645 commits

    • f55e719e...d9aca741 - 642 commits from branch master
    • ae9791fd - Added award emoji animation and improved active state
    • 9ed71c70 - added same animation to award emoji in notes buttons
    • 273e2d63 - added 3rd is-active smiley state to enhance animation

    Compare with previous version

    · Apr 03, 2017

    added 645 commits

    • f55e719e...d9aca741 - 642 commits from branch master
    • ae9791fd - Added award emoji animation and improved active state
    • 9ed71c70 - added same animation to award emoji in notes buttons
    • 273e2d63 - added 3rd is-active smiley state to enhance animation

    Compare with previous version

    added 645 commits * f55e719e...d9aca741 - 642 commits from branch `master` * ae9791fd - Added award emoji animation and improved active state * 9ed71c70 - added same animation to award emoji in notes buttons * 273e2d63 - added 3rd is-active smiley state to enhance animation [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3721568&start_sha=f55e719edabacd0a015f484ddb4284d3aac298bf)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Apr 03, 2017
    Developer

    @fatihacet this is still a problem 😉

    @fatihacet this is still a problem :wink:
  • Simon Knox @psimyn commented · Apr 04, 2017
    Maintainer

    @dimitrieh updated to remove is-active after adding emoji.

    smile

    @dimitrieh updated to remove is-active after adding emoji. ![smile](/uploads/40f51030f0e0bb114de51d05dbf17b6b/smile.gif)
  • Simon Knox @psimyn

    added 5 commits

    • 6140c2ed - Added award emoji animation and improved active state
    • ec27474d - added same animation to award emoji in notes buttons
    • f55e719e - added 3rd is-active smiley state to enhance animation
    • 09ef9a4c - remove is-active class after adding emoji
    • 8b1f29fd - Merge branch 'award-emoji-button-smiley-animation' of gitlab.com:gitlab-org/gitl…

    Compare with previous version

    · Apr 04, 2017

    added 5 commits

    • 6140c2ed - Added award emoji animation and improved active state
    • ec27474d - added same animation to award emoji in notes buttons
    • f55e719e - added 3rd is-active smiley state to enhance animation
    • 09ef9a4c - remove is-active class after adding emoji
    • 8b1f29fd - Merge branch 'award-emoji-button-smiley-animation' of gitlab.com:gitlab-org/gitl…

    Compare with previous version

    added 5 commits * 6140c2ed - Added award emoji animation and improved active state * ec27474d - added same animation to award emoji in notes buttons * f55e719e - added 3rd is-active smiley state to enhance animation * 09ef9a4c - remove is-active class after adding emoji * 8b1f29fd - Merge branch 'award-emoji-button-smiley-animation' of gitlab.com:gitlab-org/gitl… [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3722728&start_sha=273e2d6369d2e11e6c93c2446ad436ca6aa46c49)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Apr 04, 2017
    Developer

    @psimyn works like a charm! although now it has some tests failing 😺

    that last commit seems to add very much, is that intended?

    @psimyn works like a charm! although now it has some tests failing :smiley_cat: that last commit seems to add very much, is that intended?
  • Dimitrie Hoekstra @dimitrieh

    assigned to @psimyn

    · Apr 04, 2017

    assigned to @psimyn

    assigned to @psimyn
    Toggle commit list
  • Simon Knox @psimyn commented · Apr 04, 2017
    Maintainer

    thanks @dimitrieh - fixing the failing spinach tests now

    The last commit is a merge commit (the branch I had was out of date before my changes) only changes are 09ef9a4c

    thanks @dimitrieh - fixing the failing spinach tests now The last commit is a merge commit (the branch I had was out of date before my changes) only changes are https://gitlab.com/gitlab-org/gitlab-ce/commit/09ef9a4cbcfef77df138689b5c5245aae5130828
  • Simon Knox @psimyn commented · Apr 05, 2017
    Maintainer

    @dimitrieh test worked after retry with latest branch 🤷

    the tooltip overflow was an existing issue, fixed in latest commit.

    @dimitrieh test worked after retry with latest branch :shrug: the tooltip overflow was an existing issue, fixed in latest commit.
  • Simon Knox @psimyn

    added 1 commit

    • 368765e8 - fix hidden tooltip on Add award button

    Compare with previous version

    · Apr 05, 2017

    added 1 commit

    • 368765e8 - fix hidden tooltip on Add award button

    Compare with previous version

    added 1 commit * 368765e8 - fix hidden tooltip on Add award button [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3742390&start_sha=8b1f29fd2df2fd9431f20ed3ac8e7c4d741953b7)
    Toggle commit list
  • Simon Knox @psimyn

    assigned to @dimitrieh

    · Apr 05, 2017

    assigned to @dimitrieh

    assigned to @dimitrieh
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh

    added 1 commit

    • 20594f2c - fix weird mispositioning of smiley because of reliance on absolute positioned parent

    Compare with previous version

    · Apr 05, 2017

    added 1 commit

    • 20594f2c - fix weird mispositioning of smiley because of reliance on absolute positioned parent

    Compare with previous version

    added 1 commit * 20594f2c - fix weird mispositioning of smiley because of reliance on absolute positioned parent [Compare with previous version](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130/diffs?diff_id=3754752&start_sha=368765e869bbc71704a902dacc681391bca0b5a3)
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Apr 05, 2017
    Developer

    thanks a lot @psimyn

    this last commit however created this glitch, because underlying objects rely on absolute positioning

    2017-04-05_20.05.34

    fixed it with a commit

    @annabeldunstone would you be able to merge this?

    thanks a lot @psimyn this last commit however created this glitch, because underlying objects rely on absolute positioning ![2017-04-05_20.05.34](/uploads/099e319068ca3fb6a265c71767e9ca3e/2017-04-05_20.05.34.gif) fixed it with a commit @annabeldunstone would you be able to merge this?
  • Dimitrie Hoekstra @dimitrieh

    assigned to @annabeldunstone

    · Apr 05, 2017

    assigned to @annabeldunstone

    assigned to @annabeldunstone
    Toggle commit list
  • Simon Knox @psimyn commented · Apr 06, 2017
    Maintainer

    thanks @dimitrieh, good catch!

    thanks @dimitrieh, good catch!
  • Annabel Gray @annabeldunstone commented · Apr 06, 2017
    Maintainer

    LGTM! Thanks @dimitrieh & @psimyn 🚀

    LGTM! Thanks @dimitrieh & @psimyn :rocket:
  • Annabel Gray @annabeldunstone

    merged

    · Apr 06, 2017

    merged

    merged
    Toggle commit list
  • Annabel Gray @annabeldunstone

    mentioned in commit 8199ff7b

    · Apr 06, 2017

    mentioned in commit 8199ff7b

    mentioned in commit 8199ff7bd71ce91fbc945b2c31010fcf654bda67
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh commented · Apr 06, 2017
    Developer

    jeuj!

    jeuj!
  • Eric Eastwood 🌴 @MadLittleMods

    mentioned in issue #30863 (closed)

    · Apr 12, 2017

    mentioned in issue #30863 (closed)

    mentioned in issue #30863
    Toggle commit list
  • Dimitrie Hoekstra @dimitrieh

    mentioned in issue #30909 (closed)

    · Apr 13, 2017

    mentioned in issue #30909 (closed)

    mentioned in issue #30909
    Toggle commit list
  • Winnie Hellmann (back on 4th) @winh commented · May 04, 2017
    Developer

    @dimitrieh Thank you for this! I just noticed it and it made my day. 😄

    @dimitrieh Thank you for this! I just noticed it and it made my day. :smile:
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Annabel Gray
Assignee
Annabel Gray @annabeldunstone
Assign to
9.1
Milestone
9.1
Assign milestone
Time tracking
3
Labels
award emoji emoji frontend
Assign labels
  • View project labels
Reference: gitlab-org/gitlab-ce!10130

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.