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

Merge branch '32631-issue-emoji-wrap' into 'master' 

Fix spacing of issue emojis

Closes #32631

See merge request !11567
This commit is contained in:
Clement Ho 2017-05-22 18:39:30 +00:00
parent d089a1d215 5e987d1016
commit b8b0d59494
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/framework/awards.scss
View File

@ -108,7 +108,7 @@
}
.award-control {
margin-right: 5px;
margin: 0 5px 6px 0;
outline: 0;
&.disabled {

4
app/assets/stylesheets/pages/issuable.scss
View File

@ -56,6 +56,10 @@
padding: 5px;
max-height: calc(100vh - 100px);
}
.emoji-block {
padding: 10px 0 4px;
}
}
.issuable-filter-count {

6
app/views/projects/issues/show.html.haml
View File

@ -69,11 +69,11 @@
#related-branches{ data: { url: related_branches_namespace_project_issue_url(@project.namespace, @project, @issue) } }
// This element is filled in using JavaScript.
.content-block.content-block-small
.content-block.emoji-block
.row
.col-sm-6
.col-sm-8
= render 'award_emoji/awards_block', awardable: @issue, inline: true
.col-sm-6.new-branch-col
.col-sm-4.new-branch-col
= render 'new_branch' unless @issue.confidential?
%section.issuable-discussion