diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-17 19:55:33 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-17 19:55:33 +0000 |
| commit | 71ecd8c6ed2cb6cf317588b36b662d08aaaad116 (patch) | |
| tree | 7f80574ff0fa1d531a2d879d0cf2031498bb3c71 | |
| parent | d97b3d140712c1d8ab5f00681f09b040ed31b156 (diff) | |
| parent | 1a259bc64409925b4983f8c3151f01c4a19bfc6a (diff) | |
| download | gitlab-ce-71ecd8c6ed2cb6cf317588b36b662d08aaaad116.tar.gz | |
Merge branch 'commit-header' into 'master'
Fixes header vertical centering.
Fixes header centering.
cc @dzaporozhets
See merge request !4170
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index fc3f214aba5..35ab28b3fea 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -26,6 +26,8 @@ .commit-info-row { margin-bottom: 10px; + line-height: 24px; + padding-top: 6px; &.commit-info-row-header { line-height: 34px; diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index b117517c0dd..3ad866bb2f1 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -6,10 +6,10 @@ .pull-right.commit-action-buttons - if defined?(@notes_count) && @notes_count > 0 - %span.btn.disabled.btn-grouped.hidden-xs + %span.btn.disabled.btn-grouped.hidden-xs.append-right-10 = icon('comment') = @notes_count - = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped hidden-xs hidden-sm" do + = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-default append-right-10 hidden-xs hidden-sm" do Browse Files .dropdown.inline %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } } |