Commit 249edf51 authored by pburdette's avatar pburdette

Improve button layout

Improve button layout for pipelines
table and change icon for jobs table.

Changelog: changed
parent 0d286bc6
...@@ -87,6 +87,8 @@ export default { ...@@ -87,6 +87,8 @@ export default {
@click="handleRetryClick" @click="handleRetryClick"
/> />
<pipeline-multi-actions :pipeline-id="pipeline.id" />
</div>
<gl-button <gl-button
v-if="pipeline.flags.cancelable" v-if="pipeline.flags.cancelable"
v-gl-tooltip.hover v-gl-tooltip.hover
...@@ -95,14 +97,11 @@ export default { ...@@ -95,14 +97,11 @@ export default {
:title="$options.i18n.cancelTitle" :title="$options.i18n.cancelTitle"
:loading="isCancelling" :loading="isCancelling"
:disabled="isCancelling" :disabled="isCancelling"
icon="close" icon="cancel"
variant="danger" variant="danger"
category="primary" category="primary"
class="js-pipelines-cancel-button" class="js-pipelines-cancel-button gl-ml-1"
@click="handleCancelClick" @click="handleCancelClick"
/> />
<pipeline-multi-actions :pipeline-id="pipeline.id" />
</div>
</div> </div>
</template> </template>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
- if can?(current_user, :update_build, job) - if can?(current_user, :update_build, job)
- if job.active? - if job.active?
= link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: _('Cancel'), class: 'gl-button btn btn-default btn-icon' do = link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: _('Cancel'), class: 'gl-button btn btn-default btn-icon' do
= sprite_icon('close', css_class: 'gl-icon') = sprite_icon('cancel', css_class: 'gl-icon')
- elsif job.scheduled? - elsif job.scheduled?
.gl-button.btn.btn-default.btn-icon.disabled{ disabled: true } .gl-button.btn.btn-default.btn-icon.disabled{ disabled: true }
= sprite_icon('planning', css_class: 'gl-icon') = sprite_icon('planning', css_class: 'gl-icon')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment