diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-05-18 10:18:16 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-17 09:49:05 +0100 |
| commit | a7a504157fa3e97cd7b0fd76b4af83ad40b78623 (patch) | |
| tree | 5edaa14625f68fa0f41de4ff29c92382d0681271 /app | |
| parent | 53f23b5ad9c9761cc22c97263d0e97b10808d3e1 (diff) | |
| download | gitlab-ce-a7a504157fa3e97cd7b0fd76b4af83ad40b78623.tar.gz | |
Use line-height instead of height.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 41e19564726..35ab28b3fea 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -25,9 +25,9 @@ } .commit-info-row { - height: 36px; - padding-top: 6px; 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..e2fa2f97d41 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -9,7 +9,7 @@ %span.btn.disabled.btn-grouped.hidden-xs = 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" } } |