diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-08 14:09:30 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-12 14:50:57 -0500 |
| commit | 191687a10ce275f98e287876ddf7e69969790e71 (patch) | |
| tree | e1c5675e75c448ede95dbc3069ffd16eda9037da | |
| parent | 1f67cc4a559e72bedf06f169343c504fcfdd3d49 (diff) | |
| download | gitlab-ce-191687a10ce275f98e287876ddf7e69969790e71.tar.gz | |
Add empty deploy dropdown button
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 27 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 28 |
2 files changed, 46 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index fb5840a4f67..c73755ee920 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -90,12 +90,35 @@ .pipeline-actions { .btn { + margin: 0; + } + + .dropdown-toggle, + .dropdown-menu { color: $table-text-gray; + + .fa { + color: $table-text-gray; + margin-right: 6px; + font-size: 14px; + } } .btn-remove { color: $white-light; } + + .btn-group { + &.open { + .btn-default { + background-color: $white-normal; + border-color: $border-white-normal; + + &:hover { + } + } + } + } } .build-link { @@ -104,4 +127,8 @@ color: $gl-dark-link-color; } } + + .btn-group.open .dropdown-toggle { + box-shadow: none; + } } diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index b8712b5dc45..4167db3fdcb 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -57,16 +57,26 @@ .controls.hidden-xs.pull-right - artifacts = pipeline.builds.latest.select { |b| b.artifacts? } - if artifacts.present? - .dropdown.inline.build-artifacts - %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'} - = icon('download') - %b.caret - %ul.dropdown-menu.dropdown-menu-align-right - - artifacts.each do |build| + .btn-group.inline + .btn-group + %a.dropdown-toggle.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'} + = icon("play") + %b.caret + %ul.dropdown-menu.dropdown-menu-align-right %li - = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do - = icon("download") - %span Download '#{build.name}' artifacts + = link_to '#' do + = icon("play") + %span Deploy to production + .btn-group + %a.dropdown-toggle.btn.btn-default.build-artifacts{type: 'button', 'data-toggle' => 'dropdown'} + = icon("download") + %b.caret + %ul.dropdown-menu.dropdown-menu-align-right + - artifacts.each do |build| + %li + = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do + = icon("download") + %span Download '#{build.name}' artifacts - if can?(current_user, :update_pipeline, @project) - if pipeline.retryable? |