1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-21 13:11:52 +02:00

Bootstrap 4 fixes.

This commit is contained in:
Cameron 2019-03-02 13:22:46 -08:00
parent 5efcfc2074
commit 5b9d334530
3 changed files with 50 additions and 9 deletions

View File

@ -8,12 +8,12 @@
// TEMPLATE FOR {NAVIGATION=main}
$NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav nav-main">';
$NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav nav-main ml-auto">';
// Main Link
$NAVIGATION_TEMPLATE['main']['item'] = '
<li>
<a role="button" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
<li class="nav-item">
<a class="nav-link" role="button" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
{LINK_ICON}{LINK_NAME}
</a>
</li>
@ -21,8 +21,8 @@ $NAVIGATION_TEMPLATE['main']['item'] = '
// Main Link - active state
$NAVIGATION_TEMPLATE['main']['item_active'] = '
<li class="active">
<a class="e-tip" role="button" data-target="#" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
<li class="nav-item active">
<a class="nav-link e-tip" role="button" data-target="#" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
{LINK_ICON} {LINK_NAME}
</a>
</li>
@ -30,8 +30,8 @@ $NAVIGATION_TEMPLATE['main']['item_active'] = '
// Main Link which has a sub menu.
$NAVIGATION_TEMPLATE['main']['item_submenu'] = '
<li class="dropdown {LINK_IDENTIFIER}">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
<li class="nav-item dropdown {LINK_IDENTIFIER}">
<a class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
{LINK_ICON}{LINK_NAME}
<span class="caret"></span>
</a>
@ -41,7 +41,7 @@ $NAVIGATION_TEMPLATE['main']['item_submenu'] = '
// Main Link which has a sub menu - active state.
$NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
<li class="dropdown active {LINK_IDENTIFIER}">
<li class="nav-item dropdown active {LINK_IDENTIFIER}">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
{LINK_ICON}{LINK_NAME}
<span class="caret"></span>

View File

@ -2,3 +2,7 @@
/* CUSTOM Responsive Styles */
body {
padding-top: 56px;
}

View File

@ -64,11 +64,48 @@ $LAYOUT = array();
// TODO Add navigation
$LAYOUT['_header_'] = '
<div class="container">
<!-- Navigation -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
<div class="container">
<a class="navbar-brand" href="{SITEURL}">{SITENAME}</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
{NAVIGATION=main}
<!-- <ul class="navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="#">Home
<span class="sr-only">(current)</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">About</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Services</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Contact</a>
</li>
</ul>-->
</div>
</div>
</nav>
<!-- Page Content -->
<div class="container">
';
$LAYOUT['_footer_'] = '
</div>
<!-- Footer -->
<footer class="py-5 bg-dark">
<div class="container">
<p class="m-0 text-center text-white">{SITEDISCLAIMER}</p>
</div>
<!-- /.container -->
</footer>
';
$LAYOUT['default'] = <<<TMPL