Commit 1309aeb8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ui-improvements' into 'master'

Ui improvements

* revert of wrong patch
* spall margin change

Explanation with screenshots here - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/579#note_1845510

See merge request !1117
parents 8ceb7c05 1c3c2326
...@@ -91,8 +91,6 @@ ...@@ -91,8 +91,6 @@
@media(min-width: $screen-sm-max) { @media(min-width: $screen-sm-max) {
.merge-request .merge-request-tabs{ .merge-request .merge-request-tabs{
margin: 20px 0;
li { li {
a { a {
padding: 15px 40px; padding: 15px 40px;
...@@ -102,6 +100,11 @@ ...@@ -102,6 +100,11 @@
} }
} }
.merge-request .merge-request-tabs{
margin-top: 30px;
margin-bottom: 20px;
}
.mr_source_commit, .mr_source_commit,
.mr_target_commit { .mr_target_commit {
.commit { .commit {
......
...@@ -60,7 +60,11 @@ ...@@ -60,7 +60,11 @@
} }
.tree_author { .tree_author {
padding-left: 8px; padding-right: 8px;
.commit-author-name {
color: gray;
}
} }
.tree_commit { .tree_commit {
......
%span.str-truncated %span.str-truncated
%span.tree_author= commit_author_link(commit, avatar: true, size: 16)
= link_to_gfm commit.title, namespace_project_commit_path(@project.namespace, @project, commit.id), class: "tree-commit-link" = link_to_gfm commit.title, namespace_project_commit_path(@project.namespace, @project, commit.id), class: "tree-commit-link"
%span.tree_author
[
commit_author_link(commit, avatar: false)
]
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