summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-07 16:09:46 +0100
committerPhil Hughes <me@iamphill.com>2016-06-08 10:11:44 +0100
commit41c2ea9b7a036da7064b433de43c19e578cc7531 (patch)
treec904472ff5bc99004bf94ad5d3bb708ac9747304
parente5a83a9a94f7fbedb2fcce645248e1198dcf474f (diff)
downloadgitlab-ce-41c2ea9b7a036da7064b433de43c19e578cc7531.tar.gz
Vertical alignment of buttons in commit row
-rw-r--r--app/assets/stylesheets/pages/commits.scss6
-rw-r--r--app/views/projects/commits/_commit.html.haml2
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index a392993b38d..335d9e5efd7 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -20,8 +20,8 @@
}
.commit-row-title {
- line-height: 20px;
- margin-bottom: 2px;
+ line-height: 1;
+ margin-bottom: 6px;
.notes_count {
float: right;
@@ -115,7 +115,7 @@
.commit-row-info {
color: $gl-gray;
- line-height: 24px;
+ line-height: 1;
a {
color: $gl-gray;
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 757f4e7e8e0..a959b34a539 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -9,7 +9,7 @@
= cache(cache_key) do
%li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" }
- = commit_author_avatar(commit)
+ = commit_author_avatar(commit, size: 36)
.commit-row-title
%span.item-title
= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"