diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-09 10:31:38 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-09 10:31:38 +0200 |
| commit | b833f208f3a31a6ac964dac422141249f2278fd9 (patch) | |
| tree | fbd0d9249029e37aac9c54a8f5da82704d986b8a | |
| parent | efb17e05999cc49abc891cb38970ed77690cdcb6 (diff) | |
| parent | 1309aeb87163a1451519d8c0a23686d364c9a6c0 (diff) | |
| download | gitlab-ce-b833f208f3a31a6ac964dac422141249f2278fd9.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/tree/_tree_commit_column.html.haml | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 9af8227a52f..bb61a51029b 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -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 { diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 642bcd943aa..34ee4d7b31e 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -60,7 +60,11 @@ } .tree_author { - padding-left: 8px; + padding-right: 8px; + + .commit-author-name { + color: gray; + } } .tree_commit { diff --git a/app/views/projects/tree/_tree_commit_column.html.haml b/app/views/projects/tree/_tree_commit_column.html.haml index 86a80703072..50521264a61 100644 --- a/app/views/projects/tree/_tree_commit_column.html.haml +++ b/app/views/projects/tree/_tree_commit_column.html.haml @@ -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) - ] |