diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-22 12:20:20 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-22 12:20:20 +0000 |
| commit | 5806678e711aaa7a377d96a0f8623b67616bdb6e (patch) | |
| tree | 8658231821e0c260bb54a49be52e285a09a9da81 | |
| parent | 7bf28a4adaabac7b974ef7d829e604d77eb9d9df (diff) | |
| download | gitlab-ce-5806678e711aaa7a377d96a0f8623b67616bdb6e.tar.gz | |
Convert button into a btn group according to mockups
| -rw-r--r-- | app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 index 54e8f977a47..89d501538f5 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 @@ -19,9 +19,10 @@ }, template: ` <td class="pipeline-actions hidden-xs"> - <div class="controls pull-right"> - <div class="btn-group inline"> + <div class="pull-right"> + <div class="btn-group"> <div class="btn-group"> + <button v-if='actions' class="dropdown-toggle btn btn-default has-tooltip js-pipeline-dropdown-manual-actions" @@ -46,6 +47,7 @@ </li> </ul> </div> + <div class="btn-group"> <button v-if='artifacts' @@ -62,7 +64,6 @@ <li v-for='artifact in pipeline.details.artifacts'> <a rel="nofollow" - download :href='artifact.path' > <i class="fa fa-download" aria-hidden="true"></i> @@ -71,32 +72,34 @@ </li> </ul> </div> - </div> - <div class="cancel-retry-btns inline"> - <a - v-if='pipeline.flags.retryable' - class="btn has-tooltip" - title="Retry" - rel="nofollow" - data-method="post" - data-placement="top" - data-toggle="dropdown" - :href='pipeline.retry_path' - aria-label="Retry"> - <i class="fa fa-repeat" aria-hidden="true"></i> - </a> - <a - v-if='pipeline.flags.cancelable' - class="btn btn-remove has-tooltip" - title="Cancel" - rel="nofollow" - data-method="post" - data-placement="top" - data-toggle="dropdown" - :href='pipeline.cancel_path' - aria-label="Cancel"> - <i class="fa fa-remove" aria-hidden="true"></i> - </a> + <div class="btn-group"> + <a + v-if='pipeline.flags.retryable' + class="btn btn-default btn-retry has-tooltip" + title="Retry" + rel="nofollow" + data-method="post" + data-placement="top" + data-toggle="dropdown" + :href='pipeline.retry_path' + aria-label="Retry"> + <i class="fa fa-repeat" aria-hidden="true"></i> + </a> + </div> + <div class="btn-group"> + <a + v-if='pipeline.flags.cancelable' + class="btn btn-remove has-tooltip" + title="Cancel" + rel="nofollow" + data-method="post" + data-placement="top" + data-toggle="dropdown" + :href='pipeline.cancel_path' + aria-label="Cancel"> + <i class="fa fa-remove" aria-hidden="true"></i> + </a> + </div> </div> </div> </td> |