Skip to content

Commit

Permalink
fix styling of modal close button under Bootstrap5 (#1093)
Browse files Browse the repository at this point in the history 
Signed-off-by: Nicolas Höning <nicolas@seita.nl>
  • Loading branch information
@nhoening
nhoening committed Jun 11, 2024
1 parent f59c108 commit 1d7b6ca
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 28 deletions.
9 changes: 0 additions & 9 deletions flexmeasures/ui/static/css/flexmeasures.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,15 +1026,6 @@ body .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover {
z-index: 999992 !important;
}

.close:focus, .close:hover {
color: var(--red);
transition: .3s;
-webkit-transition: .3s;
-moz-transition: .3s;
-ms-transition: .3s;
-o-transition: .3s;
}

/* ---- End Modal ---- */


Expand Down
16 changes: 4 additions & 12 deletions flexmeasures/ui/templates/admin/upload.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,11 @@ <h1>Meter data</h1>
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editClientModalLabel">
<span id="add-client-header">Add a client</span>
<span id="edit-client-header">Edit <span id="edit-client-name-header"> </span></span>
</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form id="edit-client-form" enctype="multipart/form-data" class="form-horizontal">
Expand Down Expand Up @@ -138,12 +136,10 @@ <h4 class="modal-title text-center" id="removeClientModalLabel">Are you sure you
<div class="modal-dialog modal-lg" id="edit-client-data-set-modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editClientDataSetModalLabel">
<span id="edit-client-data-set-name-header"> </span> for <span id="edit-client-data-set-owner-header"> </span>
</h4>
<button type="button" class="btn-close" data-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div id="client-data-set-plot" class="data-set-plot edit-data-set-hideable"> </div>
Expand Down Expand Up @@ -216,13 +212,11 @@ <h1>Price data</h1>
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editMarketModalLabel">
<span id="add-market-header">Add a market</span>
<span id="edit-market-header">Edit market &ldquo;<span id="edit-market-name-header"> </span>&rdquo;</span>
</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form id="edit-market-form" enctype="multipart/form-data" class="form-horizontal">
Expand Down Expand Up @@ -268,12 +262,10 @@ <h4 class="modal-title text-center" id="removeMarketModalLabel">Are you sure you
<div class="modal-dialog modal-lg" id="edit-market-data-set-modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="editMarketDataSetModalLabel">
<span id="edit-market-data-set-name-header"> </span> for <span id="edit-market-data-set-owner-header"> </span>
</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div id="market-data-set-plot" class="data-set-plot edit-data-set-hideable"> </div>
Expand Down
8 changes: 2 additions & 6 deletions flexmeasures/ui/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,10 +707,8 @@
<div class="modal-content">

<div class="modal-header">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="modalLabelLarge">About FlexMeasures</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>

<div class="modal-body">
Expand Down Expand Up @@ -777,10 +775,8 @@ <h4 class="modal-title" id="modalLabelLarge">About FlexMeasures</h4>
<div class="modal-content">

<div class="modal-header">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title" id="modalLabelLarge">Credits</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>

<div class="modal-body">
Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/rq_dashboard/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="modal-content">
<div class="modal-header">
<h3>Do you really want to <span id="confirmation-modal-action"></span>?</h3>
<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
</div>
<div class="modal-footer">
<button type="button" id="confirmation-modal-no" class="btn">No</button>
Expand Down

0 comments on commit 1d7b6ca

Please sign in to comment.