Commit 28e6089a authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'push-event-vertical-space' into 'master'

Make push events have equal vertical spacing.

## What does this MR do?

Evens out the vertical space between lines in push events.

## Are there points in the code the reviewer needs to double check?

Not afaik. 

## Why was this MR needed?

UI consistency.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/19517

## Screenshots (if relevant)

Before: 
![Screen_Shot_2016-08-26_at_5.23.33_PM](/uploads/78e7a89912ec504d598f9bfec2a83eea/Screen_Shot_2016-08-26_at_5.23.33_PM.png)
After: 
![Screen_Shot_2016-08-26_at_5.23.16_PM](/uploads/3fa3e0902ef76b1e9c82e052842cd0ee/Screen_Shot_2016-08-26_at_5.23.16_PM.png)




## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc: @winniehell

See merge request !6055
parents 0693fee2 157c3acb
Please view this file on the master branch, on stable branches it's out of date.
v 8.12.0 (unreleased)
- Make push events have equal vertical spacing.
- Add two-factor recovery endpoint to internal API !5510
- Add font color contrast to external label in admin area (ClemMakesApps)
- Change merge_error column from string to text type
......
......@@ -115,11 +115,8 @@
}
&.commits-stat {
margin-top: 3px;
display: block;
padding: 3px;
padding-left: 0;
padding: 0 3px 0 0;
&:hover {
background: none;
}
......
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