diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 01:28:47 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 01:28:47 +0300 |
commit | 630c40b9a2b14c96254a21bea23835e28ae6140a (patch) | |
tree | 30b4dc97805be456da710cabfa37621be4a4a597 /app | |
parent | 257075e43b88056fa38ca157f3552d3fa87653b2 (diff) | |
parent | 2471b01b11d638116b63c75ab324a3872f0c8245 (diff) |
Merge branch '22914-mini-graph-icons' into 'master'
Add new icon for skipped builds; show created state in mini graph
![Screen_Shot_2016-11-03_at_1.31.02_PM](/uploads/69be86d59f5939329cd869804e86cb87/Screen_Shot_2016-11-03_at_1.31.02_PM.png)
![Screen_Shot_2016-11-03_at_1.30.46_PM](/uploads/0d568ad94e3f072beb0728b402aa695a/Screen_Shot_2016-11-03_at_1.30.46_PM.png)
Closes #22914
See merge request !7276
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/icons.scss | 12 | ||||
-rw-r--r-- | app/helpers/ci_status_helper.rb | 4 | ||||
-rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/icons/_icon_status_canceled.svg (renamed from app/views/shared/icons/_icon_status_cancel.svg) | 2 | ||||
-rw-r--r-- | app/views/shared/icons/_icon_status_created.svg | 2 | ||||
-rw-r--r-- | app/views/shared/icons/_icon_status_skipped.svg | 1 |
6 files changed, 19 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/icons.scss b/app/assets/stylesheets/pages/icons.scss new file mode 100644 index 00000000000..407c8db211d --- /dev/null +++ b/app/assets/stylesheets/pages/icons.scss @@ -0,0 +1,12 @@ +// CI icon colors + +.ci-status-icon { + &-created { + fill: $gray-darkest; + } + + &-skipped, + &-canceled { + fill: $gl-text-color; + } +} diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index b7f48630bd4..fabe5c1f63a 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -47,8 +47,10 @@ module CiStatusHelper 'icon_play' when 'created' 'icon_status_created' + when 'skipped' + 'icon_status_skipped' else - 'icon_status_cancel' + 'icon_status_canceled' end custom_icon(icon_name) diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 840f468dc05..1f748d73d06 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -41,7 +41,7 @@ - else Cant find HEAD commit for this branch - - stages_status = pipeline.statuses.relevant.latest.stages_status + - stages_status = pipeline.statuses.latest.stages_status %td.stage-cell - stages.each do |stage| - status = stages_status[stage] diff --git a/app/views/shared/icons/_icon_status_cancel.svg b/app/views/shared/icons/_icon_status_canceled.svg index fd1ebbcbabd..1b2d0891244 100644 --- a/app/views/shared/icons/_icon_status_cancel.svg +++ b/app/views/shared/icons/_icon_status_canceled.svg @@ -1,4 +1,4 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"> +<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" class="ci-status-icon-canceled" viewBox="0 0 14 14"> <g fill="#5C5C5C" fill-rule="evenodd"> <path d="M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"/> <rect width="8" height="2" x="3" y="6" transform="rotate(45 7 7)" rx=".5"/> diff --git a/app/views/shared/icons/_icon_status_created.svg b/app/views/shared/icons/_icon_status_created.svg index 1f5c3b51b03..dca5d289767 100644 --- a/app/views/shared/icons/_icon_status_created.svg +++ b/app/views/shared/icons/_icon_status_created.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" enable-background="new 0 0 14 14"><path d="M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 Z" /><circle cx="7" cy="7" r="3.25"/></svg> +<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" class="ci-status-icon-created" viewBox="0 0 14 14" enable-background="new 0 0 14 14"><path d="M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 Z" /><circle cx="7" cy="7" r="3.25"/></svg> diff --git a/app/views/shared/icons/_icon_status_skipped.svg b/app/views/shared/icons/_icon_status_skipped.svg new file mode 100644 index 00000000000..014ca86b61b --- /dev/null +++ b/app/views/shared/icons/_icon_status_skipped.svg @@ -0,0 +1 @@ +<svg width="20" height="20" class="ci-status-icon-skipped" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>Group Copy 31</title><g fill="#5C5C5C" fill-rule="evenodd"><path d="M10 17.857c4.286 0 7.857-3.571 7.857-7.857S14.286 2.143 10 2.143 2.143 5.714 2.143 10 5.714 17.857 10 17.857M10 0c5.571 0 10 4.429 10 10s-4.429 10-10 10S0 15.571 0 10 4.429 0 10 0"/><path d="M10.986 11l-1.293 1.293a1 1 0 0 0 1.414 1.414l2.644-2.644a1.505 1.505 0 0 0 0-2.126l-2.644-2.644a1 1 0 0 0-1.414 1.414L10.986 9H6.4a1 1 0 0 0 0 2h4.586z"/></g></svg> |