BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
236b921b
Commit
236b921b
authored
Jun 27, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport inline loading_icon updates from EE
See
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2246#note_33577729
parent
b7ea3ce4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
loading_icon.vue
...assets/javascripts/vue_shared/components/loading_icon.vue
+13
-2
No files found.
app/assets/javascripts/vue_shared/components/loading_icon.vue
View file @
236b921b
...
...
@@ -12,9 +12,18 @@
required
:
false
,
default
:
'1'
,
},
inline
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
},
computed
:
{
rootElementType
()
{
return
this
.
inline
?
'span'
:
'div'
;
},
cssClass
()
{
return
`fa-
${
this
.
size
}
x`
;
},
...
...
@@ -22,12 +31,14 @@
};
</
script
>
<
template
>
<div
class=
"text-center"
>
<component
:is=
"this.rootElementType"
class=
"text-center"
>
<i
class=
"fa fa-spin fa-spinner"
:class=
"cssClass"
aria-hidden=
"true"
:aria-label=
"label"
>
</i>
</
div
>
</
component
>
</
template
>
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