summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-09-08 13:34:36 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-09-08 13:34:36 +0000
commit60c8969b96638b3b95d742ad7ce751f4e41893ff (patch)
tree7ee74b13bea4349f2fb71c3d919f5a9289b83691 /lib
parent7a3aeebb972eff6e1317eb061346f0fe7914ff64 (diff)
parent23157a3c4ac43e7ec26e5e0e612a0baf41ff7178 (diff)
downloadgitlab-ce-60c8969b96638b3b95d742ad7ce751f4e41893ff.tar.gz
Merge branch 'awards-control-margin' into 'master'
Fix margin for awards-control buttons ## What does this MR do? Fixes margin in awards-control ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-06_at_10.58.03_AM](/uploads/b3fcd4103669bc7ae54a22093f492391/Screen_Shot_2016-09-06_at_10.58.03_AM.png) After: ![Screen_Shot_2016-09-06_at_10.54.54_AM](/uploads/dcd0e57a8cff82fe70990a9a8e2b1232/Screen_Shot_2016-09-06_at_10.54.54_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21896 See merge request !6233
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions