From 71158b11f2bba72c464a8307a19670fc71525682 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 7 Aug 2015 18:00:55 +0200 Subject: [PATCH 1/2] Add more spacing between MR widget and tabs Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/pages/merge_requests.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 { From 1c3c232608538a2a7bb0b6b400343cad6de4a8fb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 7 Aug 2015 18:12:15 +0200 Subject: [PATCH 2/2] Revert "Put author name at the end of a tree row" This reverts commit ee0fc2c3ad9608db91175e082fe1f6da19a3aec7. --- app/assets/stylesheets/pages/tree.scss | 6 +++++- app/views/projects/tree/_tree_commit_column.html.haml | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) 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) - ]