Change alert message and button colour

This commit is contained in:
Jonathan Wong 2015-08-25 14:43:08 -07:00
parent c5237547cf
commit 5124ebfe16
2 changed files with 35 additions and 15 deletions

View file

@ -237,6 +237,35 @@ fieldset[disabled] .btn-bright.active {
color: #fff; color: #fff;
background-color: #eb8600; background-color: #eb8600;
} }
.btn-danger.btn-edit {
color: #d7d7d7;
background-color: #3B3B3B;
border-color: transparent;
float: right;
margin-right: 5px;
}
.btn-danger.btn-edit:hover {
color: #fff;
background-color: #c9302c;
border-color: #ac2925;
}
.btn-danger.btn-edit.active {
color: #fff;
background-color: #c9302c;
border-color: #ac2925;
}
.btn-danger.btn-edit.active:hover {
color: #fff;
background-color: #ac2925;
border-color: #761c19;
}
.alert-edit {
display: none;
float: right;
margin-bottom: 0;
margin-right: 5px;
padding: 6px 15px;
}
.modal-header { .modal-header {
padding: 15px 20px; padding: 15px 20px;
background-color: #323232; background-color: #323232;

View file

@ -14,12 +14,11 @@
<span><i class="fa fa-history"></i> History</span> <span><i class="fa fa-history"></i> History</span>
</div> </div>
<div class="button-bar"> <div class="button-bar">
<span data-toggle="popover" data-placement="left" data-content="Select rows to delete. Data is deleted upon exiting delete mode." id="delete-message">
<button class="btn btn-danger" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
<i class="fa fa-trash-o"></i> Delete mode
</button>&nbsp
</span>
<div class="colvis-button-bar hidden-xs"></div> <div class="colvis-button-bar hidden-xs"></div>
<button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
<i class="fa fa-trash-o"></i> Delete mode
</button>
<div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
</div> </div>
</div> </div>
<div class='table-card-back'> <div class='table-card-back'>
@ -91,7 +90,7 @@
clearSearchButton('history_table', history_table); clearSearchButton('history_table', history_table);
$('#row-edit-mode').on('click', function() { $('#row-edit-mode').on('click', function() {
$('#delete-message').popover(); $('#row-edit-mode-alert').fadeIn(200);
if ($(this).hasClass('active')) { if ($(this).hasClass('active')) {
if (history_to_delete.length > 0) { if (history_to_delete.length > 0) {
@ -116,6 +115,7 @@
$('.delete-control').each(function () { $('.delete-control').each(function () {
$(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger'); $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
$(this).addClass('hidden'); $(this).addClass('hidden');
$('#row-edit-mode-alert').fadeOut(200);
}); });
} else { } else {
@ -125,15 +125,6 @@
}); });
} }
}); });
$(window).resize(function () {
if ($('.popover').popover().is(':visible')) {
var popover = $('.popover');
popover.addClass("noTransition");
$('#delete-message').popover('show');
popover.removeClass("noTransition");
}
});
}); });
</script> </script>
</%def> </%def>