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
80f50ffa
Commit
80f50ffa
authored
Feb 08, 2021
by
Yogi
Committed by
Kushal Pandya
Feb 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add btn-default to buttons in todos page
parent
18b8cb22
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
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
changelogs/unreleased/gl-button-done.yml
changelogs/unreleased/gl-button-done.yml
+5
-0
No files found.
app/views/dashboard/todos/_todo.html.haml
View file @
80f50ffa
...
@@ -48,14 +48,14 @@
...
@@ -48,14 +48,14 @@
-
if
todo
.
pending?
-
if
todo
.
pending?
.todo-actions
.todo-actions
=
link_to
dashboard_todo_path
(
todo
),
method: :delete
,
class:
'gl-button btn btn-loading d-flex align-items-center js-done-todo'
,
data:
{
href:
dashboard_todo_path
(
todo
)
}
do
=
link_to
dashboard_todo_path
(
todo
),
method: :delete
,
class:
'gl-button btn btn-
default btn-
loading d-flex align-items-center js-done-todo'
,
data:
{
href:
dashboard_todo_path
(
todo
)
}
do
Done
Done
%span
.spinner.ml-1
%span
.spinner.ml-1
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'gl-button btn btn-loading d-flex align-items-center js-undo-todo hidden'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'gl-button btn btn-
default btn-
loading d-flex align-items-center js-undo-todo hidden'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
Undo
Undo
%span
.spinner.ml-1
%span
.spinner.ml-1
-
else
-
else
.todo-actions
.todo-actions
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'gl-button btn btn-loading d-flex align-items-center js-add-todo'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'gl-button btn btn-
default btn-
loading d-flex align-items-center js-add-todo'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
Add a to do
Add a to do
%span
.spinner.ml-1
%span
.spinner.ml-1
app/views/dashboard/todos/index.html.haml
View file @
80f50ffa
...
@@ -27,10 +27,10 @@
...
@@ -27,10 +27,10 @@
.nav-controls
.nav-controls
-
if
@todos
.
any?
(
&
:pending?
)
-
if
@todos
.
any?
(
&
:pending?
)
.gl-mr-3
.gl-mr-3
=
link_to
destroy_all_dashboard_todos_path
(
todos_filter_params
),
class:
'gl-button btn btn-loading align-items-center js-todos-mark-all'
,
method: :delete
,
data:
{
href:
destroy_all_dashboard_todos_path
(
todos_filter_params
)
}
do
=
link_to
destroy_all_dashboard_todos_path
(
todos_filter_params
),
class:
'gl-button btn btn-
default btn-
loading align-items-center js-todos-mark-all'
,
method: :delete
,
data:
{
href:
destroy_all_dashboard_todos_path
(
todos_filter_params
)
}
do
Mark all as done
Mark all as done
%span
.spinner.ml-1
%span
.spinner.ml-1
=
link_to
bulk_restore_dashboard_todos_path
,
class:
'gl-button btn btn-loading align-items-center js-todos-undo-all hidden'
,
method: :patch
,
data:
{
href:
bulk_restore_dashboard_todos_path
(
todos_filter_params
)
}
do
=
link_to
bulk_restore_dashboard_todos_path
,
class:
'gl-button btn btn-
default btn-
loading align-items-center js-todos-undo-all hidden'
,
method: :patch
,
data:
{
href:
bulk_restore_dashboard_todos_path
(
todos_filter_params
)
}
do
Undo mark all as done
Undo mark all as done
%span
.spinner.ml-1
%span
.spinner.ml-1
...
...
changelogs/unreleased/gl-button-done.yml
0 → 100644
View file @
80f50ffa
---
title
:
Add btn-default to buttons in todos page
merge_request
:
author
:
Yogi (@yo)
type
:
other
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