kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

This commit is contained in:
Dmitriy Zaporozhets 2015-08-09 10:31:38 +02:00
parent efb17e0599 1309aeb871
commit b833f208f3
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/pages/merge_requests.scss
View File

@ -91,8 +91,6 @@
@media(min-width: $screen-sm-max) {
.merge-request .merge-request-tabs{
margin: 20px 0;
li {
a {
padding: 15px 40px;
@ -102,6 +100,11 @@
}
}
.merge-request .merge-request-tabs{
margin-top: 30px;
margin-bottom: 20px;
}
.mr_source_commit,
.mr_target_commit {
.commit {

6
app/assets/stylesheets/pages/tree.scss
View File

@ -60,7 +60,11 @@
}
.tree_author {
padding-left: 8px;
padding-right: 8px;
.commit-author-name {
color: gray;
}
}
.tree_commit {

5
app/views/projects/tree/_tree_commit_column.html.haml
View File

@ -1,6 +1,3 @@
%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"
%span.tree_author
[
commit_author_link(commit, avatar: false)
]