Commit 57d90128 authored by Nic's avatar Nic Committed by Aegir user

Menu, sub-nav & header revisions, plus general css merges

parent 708870ad
......@@ -11,6 +11,7 @@ base theme = bootstrap
regions[topnav] = 'Top Navigation'
regions[navigation] = 'Navigation'
regions[subnav] = 'Sub Navigation'
regions[header] = 'Header'
regions[help] = 'Help'
regions[content] = 'Content'
......
This diff is collapsed.
......@@ -75,22 +75,22 @@
?>
<div class="CiviPage">
<header id="navbar" role="banner" class="<?php print $navbar_classes; ?> <?php if (!empty($breadcrumb)) {
print 'navbar-crumbs';
}?>">
<header id="navbar" role="banner" class="<?php print $navbar_classes; ?> <?php if (!empty($breadcrumb)) {print 'navbar-crumbs';}?>">
<?php if (!empty($page['topnav'])): ?>
<div id ="topbar">
<div id ="topbar">
<div class="navbar-collapse collapse">
<nav role="navigation" id="navigation">
<div class="container">
<?php print render($page['topnav']); ?>
<nav role="navigation" id="navigation">
<div class="container">
<?php print render($page['topnav']); ?>
</div>
</nav>
</div>
</nav>
</div>
</div>
<?php endif; ?>
<div class="container">
<div class="navbar-header">
<div id="mainnav" class="container">
<div class="navbar-header">
<?php if ($logo): ?>
<a class="logo navbar-btn pull-left" href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>">
<img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
......@@ -121,17 +121,28 @@
<?php endif; ?>
</div>
</header>
<header role="banner" id="page-header" class="CiviGreyStripe">
<?php print render($page['header']); ?>
</header> <!-- /#page-header -->
<?php if (!empty($page['subnav'])): ?>
<div id="subnav">
<div class="navbar-collapse collapse">
<nav role="navigation" id="navigation">
<div class="container">
<?php print render($page['subnav']); ?>
</div>
</nav>
</div>
</div>
<?php endif; ?>
</header>
<section>
<section class="main-body<?php if (!empty($page['subnav'])): ?> with-subnav<?php endif; ?>">
<?php if (!empty($page['header'])): ?>
<header role="banner" id="page-header" class="CiviGreyStripe">
<?php print render($page['header']); ?>
</header> <!-- /#page-header -->
<?php endif; ?>
<div class="container">
<?php if (!empty($breadcrumb)): ?>
<div class="stripe-black">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment