summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-09-06 17:13:08 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-09-06 17:13:08 +0000
commit1e042ac251119c5e3b0ef8e76f3a6d9420fba98b (patch)
treee33d9d17c07e809b249fda8a8b7ade52e4f9254a
parentaf66fefc376db8b7e392ed249105ba6ce597e025 (diff)
parent328fba3d119ecb41c0bd2454399eaef4fc9db670 (diff)
downloadgitlab-ce-1e042ac251119c5e3b0ef8e76f3a6d9420fba98b.tar.gz
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
-rw-r--r--app/assets/stylesheets/pages/commits.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index b369f5c0805..dc57a837155 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -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;