1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00

Fixes #4528 - Frontend modal now functional with Bootstrap5.

This commit is contained in:
Cameron
2021-12-02 11:20:58 -08:00
parent d9d606f615
commit 9743cb4e95
3 changed files with 10 additions and 9 deletions

View File

@@ -742,17 +742,18 @@ if(deftrue('BOOTSTRAP'))
// if(empty($LAYOUT['_modal_'])) // leave it set for now.
{
$LAYOUT['_modal_'] = '<div id="uiModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-dialog modal-lg modal-xl modal-dialog-centered modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-caption">&nbsp;</h4>
<h4 class="modal-caption modal-title col-sm-11">&nbsp;</h4>
<button type="button" class="close" data-dismiss="modal" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
<p>Loading…</p>
</div>
<div class="modal-footer">
<a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
<a href="#" data-dismiss="modal" data-bs-dismiss="modal" class="btn btn-primary">Close</a>
</div>
</div>
</div>

View File

@@ -143,7 +143,7 @@ $caption = $img.' '.vartrue($menu_pref['online_caption'], LAN_ONLINE_4);
if (getperms('1'))
{
$path = e_PLUGIN_ABS."online/config.php?iframe=1";
$caption .= "<a class='e-modal pull-right float-right' data-modal-caption='".LAN_SETTINGS."' href='".$path."' title='".LAN_SETTINGS."'><i class='fa fa-cog'></i></a>";
$caption .= "<a class='e-modal pull-right float-right float-end' data-bs-toggle='modal' data-bs-target='#uiModal' data-modal-caption='".LAN_SETTINGS."' href='".$path."' title='".LAN_SETTINGS."'><i class='fa fa-cog'></i></a>";
}

View File

@@ -397,13 +397,13 @@ div.login-page-signup-link, div.login-page-fpw-link { text-align:center }
div.search-menu { text-align: center }
div.e-debug { margin-top:50px; padding:5px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; background-color: rgb(39, 43, 48); color: rgb(200, 200, 200) }
div.e-debug .table { background-color: rgb(46, 51, 56); border-collapse: collapse; border-spacing: 0; box-sizing: border-box;
div.e-debug { margin-top:50px; padding:5px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; background-color: rgb(39, 43, 48) !important; color: rgb(200, 200, 200) !important }
div.e-debug .table { background-color: rgb(46, 51, 56) !important; border-collapse: collapse; border-spacing: 0; box-sizing: border-box;
color: rgb(200, 200, 200); font-size: 14px; line-height: 20px; margin-bottom: 20px; width: 100%; }
div.e-debug .table-striped > tbody > tr:nth-of-type(2n+1) { background-color: #353a41; }
div.e-debug .table-striped > tbody > tr:nth-of-type(2n+1) { background-color: #353a41 !important; }
div.e-debug td, div.e-debug th { padding: 5px; color: rgb(200, 200, 200); }
div.e-debug td, div.e-debug th { padding: 5px; color: rgb(200, 200, 200) !important; }
div.e-debug td { font-size: 14px; line-height: 20px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #1c1e22; }
div.e-debug h4 { text-shadow: -1px -1px 0 rgba(0,0,0,0.3); font-size: 18px; }
div.e-debug .label { display: inline; padding: .2em .6em .3em; font-size: 75%; font-weight: 700; line-height: 1;