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

Merge branch 'ui-improvements' into 'master'
1309aeb8 · Dmitriy Zaporozhets · 8ceb7c05 · 1c3c2326 · 1309aeb8 · 1309aeb8
Commit 1309aeb8 authored Aug 09, 2015 by Dmitriy Zaporozhets
3 changed files
--- 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 {

--- 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 {

--- a/app/views/projects/tree/_tree_commit_column.html.haml
+++ b/app/views/projects/tree/_tree_commit_column.html.haml
 %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)
-    ]