diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-17 10:20:46 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-17 10:20:46 -0500 |
| commit | bfe2259bb76b320bd148de4fbdcebfd1b70a59ba (patch) | |
| tree | 20228882662617a85ef48b19566eddcbeafe482f | |
| parent | 4e66551a6614283f5b085a523bdbfbc552edb976 (diff) | |
| download | gitlab-ce-bfe2259bb76b320bd148de4fbdcebfd1b70a59ba.tar.gz | |
Update CSS selector and play icon
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 | ||||
| -rw-r--r-- | app/helpers/ci_status_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build_pipeline.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index e49543d661f..30239d609bc 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -298,7 +298,7 @@ width: 150px; margin-bottom: 10px; - &.deployable { + &.playable { background-color: $gray-light; } diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index eb385d58e3b..94df7d131ca 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -39,14 +39,14 @@ module CiStatusHelper when 'running' 'icon_status_running' when 'play' - 'play' + return icon('play fw') when 'created' 'icon_status_pending' else 'icon_status_cancel' end - status == 'play' ? icon(icon_name + ' fw') : custom_icon(icon_name) + custom_icon(icon_name) end def render_commit_status(commit, tooltip_placement: 'auto left') diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml index 6be75860db2..13088ef64d9 100644 --- a/app/views/projects/ci/builds/_build_pipeline.html.haml +++ b/app/views/projects/ci/builds/_build_pipeline.html.haml @@ -1,4 +1,4 @@ -%li.build{class: ("deployable" if subject.playable? && can?(current_user, :update_build, @project))} +%li.build{class: ("playable" if subject.playable? && can?(current_user, :update_build, @project))} .build-content - if subject.playable? && can?(current_user, :update_build, @project) = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do |