diff options
| author | tauriedavis <taurie@gitlab.com> | 2016-09-06 10:54:42 -0700 |
|---|---|---|
| committer | tauriedavis <taurie@gitlab.com> | 2016-09-06 10:54:42 -0700 |
| commit | 7da2dcc12dbc11ed9790d94861fc23f0962f331c (patch) | |
| tree | 347ad9e37041da1616c614ab35792fed42ddf89f | |
| parent | aa152e4a275434949ade20d20b5dc30d23d1bba9 (diff) | |
| download | gitlab-ce-7da2dcc12dbc11ed9790d94861fc23f0962f331c.tar.gz | |
fix margin for awards-control buttons
| -rw-r--r-- | app/assets/stylesheets/pages/awards.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss index 5faedfedd66..188a4e193a6 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/pages/awards.scss @@ -94,10 +94,8 @@ .award-control { margin-right: 5px; - margin-bottom: 5px; padding-left: 5px; padding-right: 5px; - line-height: 20px; outline: 0; &:hover, diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 9d8b4cc56be..4b4d418e8ec 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -83,7 +83,7 @@ .tab-content#diff-notes-app #notes.notes.tab-pane.voting_notes - .content-block.content-block-small.oneline-block + .content-block.content-block-small = render 'award_emoji/awards_block', awardable: @merge_request, inline: true .row |