Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
25f392ea
Commit
25f392ea
authored
Mar 11, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added 'surprise' animation
parent
57a9d077
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
9 deletions
+34
-9
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+13
-7
app/assets/stylesheets/pages/awards.scss
app/assets/stylesheets/pages/awards.scss
+21
-2
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
25f392ea
...
@@ -9,7 +9,7 @@ class @AwardsHandler
...
@@ -9,7 +9,7 @@ class @AwardsHandler
$
(
"html"
).
on
'click'
,
(
event
)
->
$
(
"html"
).
on
'click'
,
(
event
)
->
if
!
$
(
event
.
target
).
closest
(
".emoji-menu"
).
length
if
!
$
(
event
.
target
).
closest
(
".emoji-menu"
).
length
if
$
(
".emoji-menu"
).
is
(
":visible"
)
if
$
(
".emoji-menu"
).
is
(
":visible"
)
$
(
".emoji-menu"
).
hide
()
$
(
".emoji-menu"
).
removeClass
"is-visible"
$
(
".awards"
)
$
(
".awards"
)
.
off
"click"
.
off
"click"
...
@@ -26,23 +26,29 @@ class @AwardsHandler
...
@@ -26,23 +26,29 @@ class @AwardsHandler
showEmojiMenu
:
->
showEmojiMenu
:
->
if
$
(
".emoji-menu"
).
length
if
$
(
".emoji-menu"
).
length
$
(
".emoji-menu"
).
show
()
if
$
(
".emoji-menu"
).
is
".is-visible"
$
(
".emoji-menu"
).
removeClass
"is-visible"
$
(
"#emoji_search"
).
blur
()
else
$
(
".emoji-menu"
).
addClass
"is-visible"
$
(
"#emoji_search"
).
focus
()
$
(
"#emoji_search"
).
focus
()
else
else
$
(
'.js-add-award'
).
addClass
"is-loading"
$
(
'.js-add-award'
).
addClass
"is-loading"
$
.
get
"/emojis"
,
(
response
)
=>
$
.
get
"/emojis"
,
(
response
)
=>
$
(
'.js-add-award'
).
removeClass
"is-loading"
$
(
'.js-add-award'
).
removeClass
"is-loading"
$
(
".js-award-holder"
).
append
response
$
(
".js-award-holder"
).
append
response
$
(
".emoji-menu"
).
show
()
setTimeout
=>
$
(
".emoji-menu"
).
addClass
"is-visible"
$
(
"#emoji_search"
).
focus
()
$
(
"#emoji_search"
).
focus
()
@
setupSearch
()
@
setupSearch
()
,
200
addAward
:
(
emoji
)
->
addAward
:
(
emoji
)
->
emoji
=
@
normilizeEmojiName
(
emoji
)
emoji
=
@
normilizeEmojiName
(
emoji
)
@
postEmoji
emoji
,
=>
@
postEmoji
emoji
,
=>
@
addAwardToEmojiBar
(
emoji
)
@
addAwardToEmojiBar
(
emoji
)
$
(
".emoji-menu"
).
hide
()
$
(
".emoji-menu"
).
removeClass
"is-visible"
addAwardToEmojiBar
:
(
emoji
)
->
addAwardToEmojiBar
:
(
emoji
)
->
@
addEmojiToFrequentlyUsedList
(
emoji
)
@
addEmojiToFrequentlyUsedList
(
emoji
)
...
...
app/assets/stylesheets/pages/awards.scss
View file @
25f392ea
...
@@ -11,14 +11,25 @@
...
@@ -11,14 +11,25 @@
position
:
absolute
;
position
:
absolute
;
top
:
100%
;
top
:
100%
;
left
:
0
;
left
:
0
;
margin-top
:
3px
;
z-index
:
1000
;
z-index
:
1000
;
display
:
none
;
min-width
:
160px
;
min-width
:
160px
;
font-size
:
14px
;
font-size
:
14px
;
background-color
:
$award-emoji-menu-bg
;
background-color
:
$award-emoji-menu-bg
;
border
:
1px
solid
$award-emoji-menu-border
;
border
:
1px
solid
$award-emoji-menu-border
;
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
box-shadow
:
0
6px
12px
rgba
(
0
,
0
,
0
,.
175
);
box-shadow
:
0
6px
12px
rgba
(
0
,
0
,
0
,.
175
);
pointer-events
:
none
;
opacity
:
0
;
transform
:
scale
(
.2
);
transform-origin
:
0
-45px
;
transition
:
all
.3s
cubic-bezier
(
.87
,-.
41
,.
19
,
1
.44
);
&
.is-visible
{
pointer-events
:
all
;
opacity
:
1
;
transform
:
scale
(
1
);
}
.emoji-menu-content
{
.emoji-menu-content
{
padding
:
$gl-padding
;
padding
:
$gl-padding
;
...
@@ -56,9 +67,17 @@
...
@@ -56,9 +67,17 @@
background
:
none
;
background
:
none
;
border
:
0
;
border
:
0
;
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
transition
:
transform
.15s
cubic-bezier
(
.3
,
0
,
.2
,
2
);
&
:hover
{
&
:hover
{
background-color
:
$white-dark
;
background-color
:
transparent
;
outline
:
0
;
transform
:
scale
(
1
.3
);
}
&
:focus
,
&
:active
{
outline
:
0
;
}
}
.emoji-icon
{
.emoji-icon
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment