diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-05-22 18:39:30 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-22 16:39:37 -0500 |
| commit | 12a11d3405e0db7554ddac1578a2ea6674ff66f6 (patch) | |
| tree | 293a62d8a19a551c3e112ae70c24949a049ac6e5 | |
| parent | 9b1e62ef9af3a08b0807a1e9172b19eb648fff7b (diff) | |
| download | gitlab-ce-12a11d3405e0db7554ddac1578a2ea6674ff66f6.tar.gz | |
Merge branch '32631-issue-emoji-wrap' into 'master'
Fix spacing of issue emojis
Closes #32631
See merge request !11567
| -rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index 8dbb63c3ff4..0db3ac1a60e 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -108,7 +108,7 @@ } .award-control { - margin-right: 5px; + margin: 0 5px 6px 0; outline: 0; &.disabled { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 0d40d6d2dae..f8944e5ce03 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -56,6 +56,10 @@ padding: 5px; max-height: calc(100vh - 100px); } + + .emoji-block { + padding: 10px 0 4px; + } } .issuable-filter-count { diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index ce6e0f91999..100f430d8a2 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -68,11 +68,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 |