BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit b8b0d594 by Clement Ho
Options

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

Fix spacing of issue emojis Closes #32631 See merge request !11567
parents d089a1d2 5e987d10
Showing with 8 additions and 4 deletions
app/assets/stylesheets/framework/awards.scss
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
} }
.award-control { .award-control {
margin-right: 5px; margin: 0 5px 6px 0;
outline: 0; outline: 0;
&.disabled { &.disabled {
......
app/assets/stylesheets/pages/issuable.scss
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
padding: 5px; padding: 5px;
max-height: calc(100vh - 100px); max-height: calc(100vh - 100px);
} }
.emoji-block {
padding: 10px 0 4px;
}
} }
.issuable-filter-count { .issuable-filter-count {
......
app/views/projects/issues/show.html.haml
...@@ -69,11 +69,11 @@ ...@@ -69,11 +69,11 @@
#related-branches{ data: { url: related_branches_namespace_project_issue_url(@project.namespace, @project, @issue) } } #related-branches{ data: { url: related_branches_namespace_project_issue_url(@project.namespace, @project, @issue) } }
// This element is filled in using JavaScript. // This element is filled in using JavaScript.
.content-block.content-block-small .content-block.emoji-block
.row .row
.col-sm-6 .col-sm-8
= render 'award_emoji/awards_block', awardable: @issue, inline: true = 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? = render 'new_branch' unless @issue.confidential?
%section.issuable-discussion %section.issuable-discussion
......
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 to comment