diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-18 19:41:29 -0500 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-28 09:00:30 -0500 |
commit | 002670ec73604feaf1e675ce98157bfb3d5709c9 (patch) | |
tree | 7c4feafe48a39bdc4a68243ff42ff34852800780 /app/views | |
parent | 0a848266d7b66b3dce19298337e9ac0b1471db11 (diff) | |
download | gitlab-ce-002670ec73604feaf1e675ce98157bfb3d5709c9.tar.gz |
Finish styling commits view
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 24 | ||||
-rw-r--r-- | app/views/projects/commit/builds.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/commit/pipelines.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/commit/show.html.haml | 3 |
4 files changed, 19 insertions, 14 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 4039d059d40..47f45ae6b1a 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -1,7 +1,11 @@ .commit-info-row.commit-info-row-header %span.hidden-xs.hidden-sm Commit - = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace hidden-xs hidden-sm" - = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace visible-xs-inline visible-sm-inline" + = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace js-details-short" + = link_to("#", class: "js-details-expand") do + %span.text-expander + \... + %span.js-details-content.hide + = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace hidden-xs hidden-sm" = clipboard_button(clipboard_text: @commit.id) %span.hidden-xs authored #{time_ago_with_tooltip(@commit.authored_date)} @@ -53,6 +57,8 @@ .commit-info-widget .widget-row.branch-info + .icon-container.commit-icon + = custom_icon("icon_commit") %span.cgray= pluralize(@commit.parents.count, "parent") - @commit.parents.each do |parent| = link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent), class: "monospace" @@ -61,12 +67,14 @@ .widget-row.pipeline-info - if @commit.status - = ci_icon_for_status(@commit.status) - Builds for - = pluralize(@commit.pipelines.count, 'pipeline') - = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status-link ci-status-icon-#{@commit.status}" do - %span.ci-status-label - = ci_label_for_status(@commit.status) + .icon-container + = ci_icon_for_status(@commit.status) + Pipeline + = link_to "##{@commit.pipelines.last.id}", pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "monospace" + for + = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" + %span.ci-status-label + = ci_label_for_status(@commit.status) in = time_interval_in_words @commit.pipelines.total_duration diff --git a/app/views/projects/commit/builds.html.haml b/app/views/projects/commit/builds.html.haml index f9d7eac3542..077b2d2725b 100644 --- a/app/views/projects/commit/builds.html.haml +++ b/app/views/projects/commit/builds.html.haml @@ -3,8 +3,7 @@ = render "projects/commits/head" %div{ class: container_class } - .prepend-top-default - = render "commit_box" + = render "commit_box" = render "ci_menu" = render "builds" diff --git a/app/views/projects/commit/pipelines.html.haml b/app/views/projects/commit/pipelines.html.haml index d85d6729a81..8233e26e4e7 100644 --- a/app/views/projects/commit/pipelines.html.haml +++ b/app/views/projects/commit/pipelines.html.haml @@ -1,7 +1,6 @@ - page_title "Pipelines", "#{@commit.title} (#{@commit.short_id})", "Commits" -.prepend-top-default - = render "commit_box" += render "commit_box" = render "ci_menu" = render "pipelines_list", pipelines: @ci_pipelines diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index cebf58d63df..b8c64d1f13e 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -4,8 +4,7 @@ = render "projects/commits/head" %div{ class: container_class } - .prepend-top-default - = render "commit_box" + = render "commit_box" - if @commit.status = render "ci_menu" - else |