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
43027868
Commit
43027868
authored
Feb 13, 2020
by
Tsegaselassie Tadesse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Bootstrap utility classes with slight SCSS modifications.
parent
a0bc549a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
14 deletions
+18
-14
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+8
-4
app/views/dashboard/todos/_todo.html.haml
app/views/dashboard/todos/_todo.html.haml
+6
-6
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+4
-4
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
43027868
...
@@ -371,11 +371,15 @@
...
@@ -371,11 +371,15 @@
}
}
.btn-loading
{
.btn-loading
{
display
:
flex
;
&
:not
(
.disabled
)
{
align-items
:
center
;
.fa
,
.spinner
{
display
:
none
;
}
}
&
:not
(
.disabled
)
.spinner
{
.fa
{
display
:
none
;
margin-right
:
5px
;
}
}
.spinner
{
.spinner
{
...
...
app/views/dashboard/todos/_todo.html.haml
View file @
43027868
...
@@ -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:
'btn btn-loading js-done-todo'
,
data:
{
href:
dashboard_todo_path
(
todo
)
}
do
=
link_to
dashboard_todo_path
(
todo
),
method: :delete
,
class:
'btn btn-loading
d-flex align-items-center
js-done-todo'
,
data:
{
href:
dashboard_todo_path
(
todo
)
}
do
Done
Done
%
i
.spinner
%
span
.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
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'btn btn-loading
d-flex align-items-center
js-undo-todo hidden'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
Undo
Undo
%
i
.spinner
%
span
.spinner
-
else
-
else
.todo-actions
.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
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'btn 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
%
i
.spinner
%
span
.spinner
app/views/dashboard/todos/index.html.haml
View file @
43027868
...
@@ -26,12 +26,12 @@
...
@@ -26,12 +26,12 @@
.nav-controls
.nav-controls
-
if
@todos
.
any?
(
&
:pending?
)
-
if
@todos
.
any?
(
&
:pending?
)
.append-right-default
.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
=
link_to
destroy_all_dashboard_todos_path
(
todos_filter_params
),
class:
'btn btn-loading
d-flex 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
%
i
.spinner
%
span
.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
=
link_to
bulk_restore_dashboard_todos_path
,
class:
'btn btn-loading
d-flex 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
%
i
.spinner
%
span
.spinner
.todos-filters
.todos-filters
.issues-details-filters.row-content-block.second-block
.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