diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 02:34:48 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 02:34:48 +0000 |
commit | 0ec62b6c5d686496aa120edd66082af94007ca75 (patch) | |
tree | fd50989710ca09928c902c933890349a7dc23987 /app/assets/stylesheets/framework/awards.scss | |
parent | 55cc28d1ca167b502ef7a2f79b11e75fa559d174 (diff) | |
parent | 5ea6f4b017ae5cecf431d26bbf69fea524fe9428 (diff) | |
download | gitlab-ce-0ec62b6c5d686496aa120edd66082af94007ca75.tar.gz |
Merge branch '26371-native-emojis-v3' into 'master'
Add emoji images - Base Native Unicode Emojis
Closes #26371
See merge request !9569
Diffstat (limited to 'app/assets/stylesheets/framework/awards.scss')
-rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index 49907417e26..f363affa46c 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -7,6 +7,7 @@ .emoji-menu { position: absolute; + top: 0; margin-top: 3px; padding: $gl-padding; z-index: 9; @@ -20,7 +21,7 @@ opacity: 0; transform: scale(.2); transform-origin: 0 -45px; - transition: .3s cubic-bezier(.87,-.41,.19,1.44); + transition: .3s cubic-bezier(.67,.06,.19,1.44); transition-property: transform, opacity; &.is-aligned-right { @@ -47,12 +48,13 @@ } .emoji-menu-list { - list-style: none; - padding-left: 0; margin-bottom: 0; + padding-left: 0; + list-style: none; } .emoji-menu-list-item { + float: left; padding: 3px; margin-left: 1px; margin-right: 1px; @@ -97,6 +99,8 @@ padding: 5px 6px; outline: 0; + line-height: 1; + &.disabled { cursor: default; |