diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-17 19:55:33 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-23 14:27:57 -0400 |
| commit | 37e5ef1f4bd89e97950e2b71d0a5b3071ec272ba (patch) | |
| tree | 9d06373d4751f23b3d930f9f7bfb9ece515d4c5f | |
| parent | 034810fa2edbb944ee72c3317e64b681ffc609d1 (diff) | |
| download | gitlab-ce-37e5ef1f4bd89e97950e2b71d0a5b3071ec272ba.tar.gz | |
Merge branch 'commit-header' into 'master'
Fixes header vertical centering.
Fixes header centering.
cc @dzaporozhets
See merge request !4170
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index a64fc18de5d..6c0e5c46afe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.9.1 (unreleased) - Fix MR-auto-close text added to description. !4836 - Add documentation for award emoji now that comments can be awarded with emojis. !4839 - Fix typo in export failure email. !4847 + - Fix header vertical centering. !4170 v 8.9.0 - Fix builds API response not including commit data 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" } } |