Commit 3d4359bb authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '229310-migrate-bootstrap-button' into 'master'

Migrate Bootstrap button to GitLab UI GlButton in Web IDE commit sidebar

See merge request gitlab-org/gitlab!39988
parents 32752f49 523d1193
...@@ -134,15 +134,17 @@ export default { ...@@ -134,15 +134,17 @@ export default {
@after-enter="afterEndTransition" @after-enter="afterEndTransition"
> >
<div v-if="isCompact" ref="compactEl" class="commit-form-compact"> <div v-if="isCompact" ref="compactEl" class="commit-form-compact">
<button <gl-button
:disabled="!someUncommittedChanges" :disabled="!someUncommittedChanges"
type="button" category="primary"
class="btn btn-primary btn-sm btn-block qa-begin-commit-button" variant="info"
block
class="qa-begin-commit-button"
data-testid="begin-commit-button" data-testid="begin-commit-button"
@click="beginCommit" @click="beginCommit"
> >
{{ __('Commit…') }} {{ __('Commit…') }}
</button> </gl-button>
<p class="text-center bold">{{ overviewText }}</p> <p class="text-center bold">{{ overviewText }}</p>
</div> </div>
<form v-else ref="formEl" @submit.prevent.stop="commit"> <form v-else ref="formEl" @submit.prevent.stop="commit">
...@@ -158,28 +160,21 @@ export default { ...@@ -158,28 +160,21 @@ export default {
<gl-button <gl-button
:loading="submitCommitLoading" :loading="submitCommitLoading"
class="float-left qa-commit-button" class="float-left qa-commit-button"
size="small"
category="primary" category="primary"
variant="success" variant="success"
@click="commit" @click="commit"
> >
{{ __('Commit') }} {{ __('Commit') }}
</gl-button> </gl-button>
<button <gl-button v-if="!discardDraftButtonDisabled" class="float-right" @click="discardDraft">
v-if="!discardDraftButtonDisabled"
type="button"
class="btn btn-default btn-sm float-right"
@click="discardDraft"
>
{{ __('Discard draft') }} {{ __('Discard draft') }}
</button> </gl-button>
<gl-button <gl-button
v-else v-else
type="button" type="button"
class="float-right" class="float-right"
category="secondary" category="secondary"
variant="default" variant="default"
size="small"
@click="toggleIsCompact" @click="toggleIsCompact"
> >
{{ __('Collapse') }} {{ __('Collapse') }}
......
---
title: Migrate Bootstrap button to GitLab UI GlButton in IDE
merge_request: 39988
author:
type: changed
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