diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-23 10:53:41 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-23 10:53:41 +0000 |
| commit | 7da0da3f20ab78fc57f4d5cc1152322049f18b1a (patch) | |
| tree | dcc68f068eb530160e92e13a986de36b25e33d2b | |
| parent | fa5443e3a930c6cd2dd573f5c5965e1a563bbe2e (diff) | |
| download | gitlab-ce-7da0da3f20ab78fc57f4d5cc1152322049f18b1a.tar.gz | |
Fix btn group not having round corners when there's only some buttons present
| -rw-r--r-- | app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 | 29 |
1 files changed, 10 insertions, 19 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 89d501538f5..04029c47668 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 @@ -21,17 +21,14 @@ <td class="pipeline-actions hidden-xs"> <div class="pull-right"> <div class="btn-group"> - <div class="btn-group"> - + <div class="btn-group" v-if="actions"> <button - v-if='actions' class="dropdown-toggle btn btn-default has-tooltip js-pipeline-dropdown-manual-actions" data-toggle="dropdown" title="Manual job" data-placement="top" - aria-label="Manual job" - > - <span v-html='svgs.iconPlay' aria-hidden="true"></span> + aria-label="Manual job"> + <span v-html="svgs.iconPlay" aria-hidden="true"></span> <i class="fa fa-caret-down" aria-hidden="true"></i> </button> <ul class="dropdown-menu dropdown-menu-align-right"> @@ -39,24 +36,21 @@ <a rel="nofollow" data-method="post" - :href='action.path' - > - <span v-html='svgs.iconPlay' aria-hidden="true"></span> + :href="action.path"> + <span v-html="svgs.iconPlay" aria-hidden="true"></span> <span>{{action.name}}</span> </a> </li> </ul> </div> - <div class="btn-group"> + <div class="btn-group" v-if="artifacts"> <button - v-if='artifacts' class="dropdown-toggle btn btn-default build-artifacts has-tooltip js-pipeline-dropdown-download" title="Artifacts" data-placement="top" data-toggle="dropdown" - aria-label="Artifacts" - > + aria-label="Artifacts"> <i class="fa fa-download" aria-hidden="true"></i> <i class="fa fa-caret-down" aria-hidden="true"></i> </button> @@ -64,17 +58,15 @@ <li v-for='artifact in pipeline.details.artifacts'> <a rel="nofollow" - :href='artifact.path' - > + :href="artifact.path"> <i class="fa fa-download" aria-hidden="true"></i> <span>{{download(artifact.name)}}</span> </a> </li> </ul> </div> - <div class="btn-group"> + <div class="btn-group" v-if="pipeline.flags.retryable"> <a - v-if='pipeline.flags.retryable' class="btn btn-default btn-retry has-tooltip" title="Retry" rel="nofollow" @@ -86,9 +78,8 @@ <i class="fa fa-repeat" aria-hidden="true"></i> </a> </div> - <div class="btn-group"> + <div class="btn-group" v-if="pipeline.flags.cancelable"> <a - v-if='pipeline.flags.cancelable' class="btn btn-remove has-tooltip" title="Cancel" rel="nofollow" |