kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removed unnecessary 'add' text in additional award emoji button

Browse source
This commit is contained in:
Dimitrie Hoekstra 2017-03-22 00:59:23 +00:00 committed by Annabel Dunstone Gray
parent 77eda52870
commit b2c2cd28f1
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/framework/awards.scss
View file

@ -92,6 +92,10 @@
.award-menu-holder {
display: inline-block;
position: relative;
.tooltip {
white-space: nowrap;
}
}
.award-control {
@ -124,6 +128,10 @@
&:focus {
outline: 0;
}
.award-control-icon {
margin: 0;
}
}
&.is-loading {
@ -153,6 +161,7 @@
.award-control-icon {
color: $border-gray-normal;
margin-top: 1px;
padding: 0 2px;
}
.award-control-text {

6
app/views/award_emoji/_awards_block.html.haml
View file

@ -10,8 +10,8 @@
- if current_user
.award-menu-holder.js-award-holder
%button.btn.award-control.js-add-award{ type: "button" }
%button.btn.award-control.has-tooltip.js-add-award{ type: 'button',
'aria-label': 'Add emoji',
data: { title: 'Add emoji', placement: "bottom" } }
= icon('smile-o', class: "award-control-icon award-control-icon-normal")
= icon('spinner spin', class: "award-control-icon award-control-icon-loading")
%span.award-control-text
Add

4
changelogs/unreleased/cleaner-additional-award-emoji-button.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Removed unnecessary 'add' text in additional award emoji button
merge_request:
author: