From 05d7ad9996a2c40457406686e4090f079ad68f0a Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Thu, 20 Jul 2017 15:53:52 +0200
Subject: [PATCH] petites adaptations

---
 css/style.css | 14 ++++++++++++--
 footer.php    | 34 +++++++++++-----------------------
 header.php    | 15 +++++++--------
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/css/style.css b/css/style.css
index dcd9d1b..25ee548 100644
--- a/css/style.css
+++ b/css/style.css
@@ -343,6 +343,16 @@ ul.commentlist {
 			margin-bottom: 10px;
 			text-align: center;
 		}
-		#barre2{
-			padding-top: 25px;
+		footer.barre{
+			padding-bottom: 25px;
 		}
+/*
+ *  Override bootstrap
+ */
+
+.navbar-default .navbar-collapse, .navbar-default {
+	margin-top: 15px;
+}
+.navbar-form {
+	    border: none;
+ }
diff --git a/footer.php b/footer.php
index ebfa1c4..105ecf8 100644
--- a/footer.php
+++ b/footer.php
@@ -1,34 +1,22 @@
-
-
         <div class="main-wrap">
-                <footer id="bottom">
-                        <div class="row barre-reseau">
-                    <div class="half-right ">
-                        <?php social_list("class=navigation")?>
-                </div>
-                <div class="half-right col-md-12" id="barre2">
-                <ul class="navigation ">
-                        <li><a href="<?php echo base_url(); ?>" title="Retour &agrave; 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>
-                    </div>
-                </div>
-                    <div class="row">
-                        <div class="col-md-12">
-                    <div class="half-left">
+            <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'); ?>
                     </div>
-                </div>
-
-                    <div class="half-right">
+                    <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 &agrave; 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>
-                </footer>
-            </div>
+            </footer>
         </div>
     </body>
 </html>
diff --git a/header.php b/header.php
index 93000fd..3f0b8ef 100644
--- a/header.php
+++ b/header.php
@@ -70,16 +70,15 @@
   	   						</li>
   	   						<?php endwhile;
   	   							endif; ?>
-  	   						<li class="tray">
-  	   							<a href="#tray" class="linky"><img src="<?php echo theme_url('img/categories.png'); ?>" alt="Categories" title="Articles par cat&eacute;gories"></a>
-  	   						</li>
 
-									<form class="navbar-form navbar-left">
-							        <div class="form-group">
-							          <input type="text" class="form-control" placeholder="Search">
+                            <li>
+				                <form id="search" action="/search" method="post" class="navbar-form navbar-left">
+							    	<div class="form-group">
+						                <input type="search" id="term" name="term" class="form-control" placeholder="Rechercher&hellip;" value="">
+						                <input type="hidden" id="whatSearch" name="whatSearch" value="all" />
 							        </div>
-							        <button type="submit" class="btn btn-default">Submit</button>
-							      </form>
+					            </form>
+                            </li>
   	   					</ul>
 
 				    </div><!-- /.navbar-collapse -->
-- 
GitLab