Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
523d1193
Commit
523d1193
authored
Dec 11, 2020
by
Nadia Sotnikova
Committed by
Enrique Alcántara
Dec 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate Bootstrap button to GitLab UI GlButton in Web IDE commit sidebar
parent
3680ebeb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
app/assets/javascripts/ide/components/commit_sidebar/form.vue
...assets/javascripts/ide/components/commit_sidebar/form.vue
+8
-13
changelogs/unreleased/229310-migrate-bootstrap-button.yml
changelogs/unreleased/229310-migrate-bootstrap-button.yml
+5
-0
No files found.
app/assets/javascripts/ide/components/commit_sidebar/form.vue
View file @
523d1193
...
...
@@ -134,15 +134,17 @@ export default {
@
after-enter=
"afterEndTransition"
>
<div
v-if=
"isCompact"
ref=
"compactEl"
class=
"commit-form-compact"
>
<button
<
gl-
button
:disabled=
"!someUncommittedChanges"
type=
"button"
class=
"btn btn-primary btn-sm btn-block qa-begin-commit-button"
category=
"primary"
variant=
"info"
block
class=
"qa-begin-commit-button"
data-testid=
"begin-commit-button"
@
click=
"beginCommit"
>
{{
__
(
'
Commit…
'
)
}}
</button>
</
gl-
button>
<p
class=
"text-center bold"
>
{{
overviewText
}}
</p>
</div>
<form
v-else
ref=
"formEl"
@
submit.prevent.stop=
"commit"
>
...
...
@@ -158,28 +160,21 @@ export default {
<gl-button
:loading=
"submitCommitLoading"
class=
"float-left qa-commit-button"
size=
"small"
category=
"primary"
variant=
"success"
@
click=
"commit"
>
{{
__
(
'
Commit
'
)
}}
</gl-button>
<button
v-if=
"!discardDraftButtonDisabled"
type=
"button"
class=
"btn btn-default btn-sm float-right"
@
click=
"discardDraft"
>
<gl-button
v-if=
"!discardDraftButtonDisabled"
class=
"float-right"
@
click=
"discardDraft"
>
{{
__
(
'
Discard draft
'
)
}}
</button>
</
gl-
button>
<gl-button
v-else
type=
"button"
class=
"float-right"
category=
"secondary"
variant=
"default"
size=
"small"
@
click=
"toggleIsCompact"
>
{{
__
(
'
Collapse
'
)
}}
...
...
changelogs/unreleased/229310-migrate-bootstrap-button.yml
0 → 100644
View file @
523d1193
---
title
:
Migrate Bootstrap button to GitLab UI GlButton in IDE
merge_request
:
39988
author
:
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment