diff --git a/css/style.css b/css/style.css index f542951256bcc785027ed63f491eda4bc4595c05..7d06ff04415f09d7f39404ac13f3d9f392114974 100644 --- a/css/style.css +++ b/css/style.css @@ -20,7 +20,7 @@ h2{ #top { overflow: hidden; padding: 20px 35px; - + margin: 20px; background: #fff; border-bottom: 1px solid rgba(22,54,36,.1); } @@ -304,6 +304,7 @@ ul.commentlist { .navbar-default .navbar-collapse, .navbar-default { margin-top: 15px; + border: none; } .navbar-form { border: none; diff --git a/footer.php b/footer.php index 105ecf8e9129777e87dbb8f00e9fc5d623e57cff..2ed81f40959bc4e31c6d8007aee39a97e8d1b7a2 100644 --- a/footer.php +++ b/footer.php @@ -1,21 +1,23 @@ <div class="main-wrap"> <footer id="bottom"> - <div class="row"> - <div class="col-md-6 col-sd-12"> - <?php echo html_meta('contact'); ?> - <?php echo html_meta('site_licence'); ?> - <?php echo html_meta('legal_informations'); ?> + <section class="content wrap"> + <div class="row"> + <div class="col-md-6 col-sd-12"> + <?php echo html_meta('contact'); ?> + <?php echo html_meta('site_licence'); ?> + <?php echo html_meta('legal_informations'); ?> + </div> + <div class="col-md-6 col-sd-12 barre"> + <?php social_list("class=col-md-12")?> + <ul class="col-md-12 barre"> + <li><a href="<?php echo base_url(); ?>" title="Retour à l'accueil.">Accueil</a></li> + <li><a href="<?php echo base_url('admin'); ?>" title="Administration">Administration</a></li> + <li><a href="<?php echo rss_url(); ?>"><?php echo social_logo('rss'); ?> RSS</a></li> + </ul> + <?php echo html_meta('w3c'); ?> + </div> </div> - <div class="col-md-6 col-sd-12 barre"> - <?php social_list("class=col-md-12")?> - <ul class="col-md-12 barre"> - <li><a href="<?php echo base_url(); ?>" title="Retour à l'accueil.">Accueil</a></li> - <li><a href="<?php echo base_url('admin'); ?>" title="Administration">Administration</a></li> - <li><a href="<?php echo rss_url(); ?>"><?php echo social_logo('rss'); ?> RSS</a></li> - </ul> - <?php echo html_meta('w3c'); ?> - </div> - </div> + </section> </footer> </div> </body> diff --git a/header.php b/header.php index 3f0b8ef4d7e2ba94644b6145164520e23039f8af..fbb426cf9bd876885fff09c42a3437255176dc7f 100644 --- a/header.php +++ b/header.php @@ -50,14 +50,20 @@ <div class="container-fluid"> <!-- Brand and toggle get grouped for better mobile display --> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> + + <a id="logo" Href="<?php echo base_url(); ?>"> + <img style="height:150px;min-width:130px;" src="<?php echo theme_url('img/logo.svg'); ?>" alt="<?php echo site_name(); ?>"> + <span><?php echo site_description(); ?></span> + </a> + </div> + <div> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a id="logo" Href="<?php echo base_url(); ?>"><img style="height:150px" src="<?php echo theme_url('img/logo.svg'); ?>" alt="<?php echo site_name(); ?>"><?php echo site_description(); ?></a> - </div> + </div> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav">