Commit 1e042ac2 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

Merge branch...

Merge branch '18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-height' into 'master'

Changed `.commit-row-title` `line-height` to `1.35` from `1`

## What does this MR do?

Changes `.commit-row-title` `line-height` to `1.35` from `1`, this is to match the `line-height: 20px;` from before 41c2ea9b.

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

## Why was this MR needed?

Not enough space between commit lines

## What are the relevant issue numbers?

Closes #18851.

## Screenshots (if relevant)

New screenshot below.

## 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 [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)
Closes #18851

See merge request !5996
parents af66fefc 328fba3d
......@@ -18,8 +18,7 @@
}
.commit-row-title {
line-height: 1;
margin-bottom: 7px;
line-height: 1.35;
.notes_count {
float: right;
......@@ -43,6 +42,7 @@
border: 1px solid $border-gray-dark;
border-radius: $border-radius-default;
margin-left: 5px;
line-height: 1;
&:hover {
background-color: darken($gray-light, 10%);
......@@ -136,7 +136,7 @@
.commit-row-info {
color: $gl-gray;
line-height: 1;
line-height: 1.35;
a {
color: $gl-gray;
......
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