diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-11 14:27:35 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-12 14:52:59 -0500 |
| commit | c57471ddb456c9640f6d77128e1fc56c7a5b35b2 (patch) | |
| tree | c4586c7ba304b8821ddfd49f4d3736f12592ea58 /app/views/projects | |
| parent | 694ab941ea99ca4c4a32ceea090317851390d56f (diff) | |
| download | gitlab-ce-c57471ddb456c9640f6d77128e1fc56c7a5b35b2.tar.gz | |
Add new stopwatch and commit icons; rename custom icon helper; fix commit pipeline layout
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/commit/_pipeline.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 2099c9f8c5d..0c29658e4d9 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -23,7 +23,7 @@ = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name" - else .light none - = icon("code-fork") + = custom_icon("icon_commit") - if defined?(commit_sha) && commit_sha = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace" @@ -58,7 +58,7 @@ %td - if build.duration %p.duration - = icon("clock-o") + = custom_icon("icon_timer") #{duration_in_words(build.finished_at, build.started_at)} - if build.finished_at %p.finished-at diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 766ea31ef70..4ef72ff5d2a 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -11,7 +11,7 @@ %span ##{pipeline.id} - if pipeline.ref = link_to pipeline.ref, namespace_project_commits_path(@project.namespace, @project, pipeline.ref), class: "monospace branch-name" - = icon("code-fork") + = custom_icon("icon_commit") = link_to pipeline.short_sha, namespace_project_commit_path(@project.namespace, @project, pipeline.sha), class: "commit-id monospace" - if pipeline.tag? %span.label.label-primary tag @@ -47,7 +47,7 @@ %td - if pipeline.started_at && pipeline.finished_at %p.duration - = icon("clock-o") + = custom_icon("icon_timer") = duration_in_numbers(pipeline.finished_at, pipeline.started_at) - if pipeline.finished_at %p.finished-at diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml index 0411137b7c6..41fd5459429 100644 --- a/app/views/projects/commit/_pipeline.html.haml +++ b/app/views/projects/commit/_pipeline.html.haml @@ -42,9 +42,7 @@ %th Status %th Build ID %th Name - %th Tags - %th Duration - %th Finished at + %th - if pipeline.project.build_coverage_enabled? %th Coverage %th diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 312bd86ed04..7612fe3719a 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -32,7 +32,7 @@ Code, test, and deploy together .blank-state .blank-state-icon - = navbar_icon("issues", size: 50) + = custom_icon("issues", size: 50) %h3.blank-state-title You don't have any issues right now. %p.blank-state-text |