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
4f031229
Commit
4f031229
authored
Mar 25, 2019
by
Enrique Alcántara
Committed by
Phil Hughes
Mar 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent fade out transition on loading-button
parent
668c38f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/javascripts/vue_shared/components/loading_button.vue
...sets/javascripts/vue_shared/components/loading_button.vue
+2
-2
app/assets/stylesheets/framework/vue_transitions.scss
app/assets/stylesheets/framework/vue_transitions.scss
+5
-1
changelogs/unreleased/57409-loading-button-transition.yml
changelogs/unreleased/57409-loading-button-transition.yml
+5
-0
No files found.
app/assets/javascripts/vue_shared/components/loading_button.vue
View file @
4f031229
...
...
@@ -53,7 +53,7 @@ export default {
<
template
>
<button
:class=
"containerClass"
:disabled=
"loading || disabled"
type=
"button"
@
click=
"onClick"
>
<transition
name=
"fade"
>
<transition
name=
"fade
-in
"
>
<gl-loading-icon
v-if=
"loading"
:inline=
"true"
...
...
@@ -63,7 +63,7 @@ export default {
class="js-loading-button-icon"
/>
</transition>
<transition
name=
"fade"
>
<transition
name=
"fade
-in
"
>
<slot>
<span
v-if=
"label"
class=
"js-loading-button-label"
>
{{
label
}}
</span>
</slot>
...
...
app/assets/stylesheets/framework/vue_transitions.scss
View file @
4f031229
.fade-enter-active
,
.fade-leave-active
{
.fade-leave-active
,
.fade-in-enter-active
,
.fade-out-leave-active
{
transition
:
opacity
$sidebar-transition-duration
$general-hover-transition-curve
;
}
.fade-enter
,
.fade-in-enter
,
.fade-out-leave-to
,
.fade-leave-to
{
opacity
:
0
;
}
changelogs/unreleased/57409-loading-button-transition.yml
0 → 100644
View file @
4f031229
---
title
:
Prevent fade out transition on loading-button component.
merge_request
:
26428
author
:
type
:
fixed
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