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
1e1b8f11
Commit
1e1b8f11
authored
Feb 13, 2020
by
Tsegaselassie Tadesse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate fa-spinner to spinner in views dashboard todos.
parent
891f27a5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+6
-3
app/views/dashboard/todos/_todo.html.haml
app/views/dashboard/todos/_todo.html.haml
+3
-3
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
1e1b8f11
...
...
@@ -371,12 +371,15 @@
}
.btn-loading
{
&
:not
(
.disabled
)
.fa
{
display
:
flex
;
align-items
:
center
;
&
:not
(
.disabled
)
.spinner
{
display
:
none
;
}
.
fa
{
margin-
righ
t
:
5px
;
.
spinner
{
margin-
lef
t
:
5px
;
}
}
...
...
app/views/dashboard/todos/_todo.html.haml
View file @
1e1b8f11
...
...
@@ -50,12 +50,12 @@
.todo-actions
=
link_to
dashboard_todo_path
(
todo
),
method: :delete
,
class:
'btn btn-loading js-done-todo'
,
data:
{
href:
dashboard_todo_path
(
todo
)
}
do
Done
=
icon
(
'spinner spin'
)
%i
{
class
:"spinner"
}
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'btn btn-loading js-undo-todo hidden'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
Undo
=
icon
(
'spinner spin'
)
%i
{
class
:"spinner"
}
-
else
.todo-actions
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'btn btn-loading js-add-todo'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
Add a To Do
=
icon
(
'spinner spin'
)
%i
{
class
:"spinner"
}
app/views/dashboard/todos/index.html.haml
View file @
1e1b8f11
...
...
@@ -28,10 +28,10 @@
.append-right-default
=
link_to
destroy_all_dashboard_todos_path
(
todos_filter_params
),
class:
'btn btn-loading js-todos-mark-all'
,
method: :delete
,
data:
{
href:
destroy_all_dashboard_todos_path
(
todos_filter_params
)
}
do
Mark all as done
=
icon
(
'spinner spin'
)
%i
{
class
:"spinner"
}
=
link_to
bulk_restore_dashboard_todos_path
,
class:
'btn btn-loading js-todos-undo-all hidden'
,
method: :patch
,
data:
{
href:
bulk_restore_dashboard_todos_path
(
todos_filter_params
)
}
do
Undo mark all as done
=
icon
(
'spinner spin'
)
%i
{
class
:"spinner"
}
.todos-filters
.issues-details-filters.row-content-block.second-block
...
...
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