Skip to content

Commit ff3ec5f

Browse files
committed
Merge branch 'develop' of github.com:modularcode/modular-admin-html into develop
2 parents ec94ac5 + 73cd3d0 commit ff3ec5f

6 files changed

Lines changed: 34 additions & 4 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<div class="modal fade" id="confirm-modal">
2+
<div class="modal-dialog animated flipInX" role="document">
3+
<div class="modal-content">
4+
<div class="modal-header">
5+
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
6+
<span aria-hidden="true">&times;</span>
7+
</button>
8+
<h4 class="modal-title"><i class="fa fa-warning"></i> Alert</h4>
9+
</div>
10+
<div class="modal-body">
11+
<p>Are you sure want to do this?</p>
12+
</div>
13+
<div class="modal-footer">
14+
<button type="button" class="btn btn-primary" data-dismiss="modal">Yes</button>
15+
<button type="button" class="btn btn-secondary" data-dismiss="modal">No</button>
16+
</div>
17+
</div><!-- /.modal-content -->
18+
</div><!-- /.modal-dialog -->
19+
</div><!-- /.modal -->

src/app/_common/modals/modal-media/modal-media.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="modal fade" id="modal-media">
2-
<div class="modal-dialog modal-lg">
2+
<div class="modal-dialog modal-lg animated flipInX">
33
<div class="modal-content">
44
<div class="modal-header">
55
<button type="button" class="close" data-dismiss="modal" aria-label="Close">

src/app/_common/modals/modals.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.modal {
2+
3+
.modal-content {
4+
border-radius: 0;
5+
6+
.modal-header {
7+
background-color: $color-primary;
8+
color: #ffffff;
9+
}
10+
}
11+
}

src/app/app-layout.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
{{> app/_common/footer/footer}}
5353
{{/block}}
5454

55-
{{!-- {{> app/_common/modals/modals}} --}}
55+
{{> app/_common/modals/modals}}
5656
</div>
5757
</div>
5858
<!-- Reference block for JS -->

src/app/dashboard/tasks/tasks.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div class="item-actions-block">
3838
<ul class="item-actions-list">
3939
<li>
40-
<a class="remove" href="#">
40+
<a class="remove" href="#" data-toggle="modal" data-target="#confirm-modal">
4141
<i class="fa fa-trash-o "></i>
4242
</a>
4343
</li>

src/app/items/list/items-list-page.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ items:
201201
<div class="item-actions-block">
202202
<ul class="item-actions-list">
203203
<li>
204-
<a class="remove" href="#">
204+
<a class="remove" href="#" data-toggle="modal" data-target="#confirm-modal">
205205
<i class="fa fa-trash-o "></i>
206206
</a>
207207
</li>

0 commit comments

Comments
 (0)