diff --git a/css/style.css b/css/style.css
index 220d49fff0e406dee6f67587e3ec279310815804..dcd9d1bf95c46456d3fa3d29d9e1ec7a9a204a69 100644
--- a/css/style.css
+++ b/css/style.css
@@ -73,7 +73,7 @@ h2{
#top a {
float: left;
- font-size: 17px;
+ font-size: 16px;
font-weight: 500;
text-decoration: none;
@@ -88,7 +88,7 @@ h2{
}
#top ul li {
float: left;
- padding-left: 40px;
+ padding-left: 20px;
}
#top ul a {
display: inline-block;
diff --git a/header.php b/header.php
index f9668aad0e4d0b0e6410808e4536e043df01d7cc..93000fd2f2e794183311563fc22c61ab16101ae0 100644
--- a/header.php
+++ b/header.php
@@ -6,6 +6,7 @@
<meta name="description" content="<?php echo site_description(); ?>">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
<link rel="stylesheet" href="<?php echo theme_url('/css/reset.css'); ?>">
<link rel="stylesheet" href="<?php echo theme_url('/css/style.css'); ?>">
<link rel="stylesheet" href="<?php echo theme_url('/css/small.css'); ?>" media="(max-width: 400px)">
@@ -20,6 +21,7 @@
<script>var base = '<?php echo theme_url(); ?>';</script>
<script src="<?php echo asset_url('/js/zepto.js'); ?>"></script>
<script src="<?php echo theme_url('/js/main.js'); ?>"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<meta name="viewport" content="width=device-width">
@@ -41,32 +43,6 @@
<?php endif; ?>
</head>
<body class="<?php echo body_class(); ?>">
- <div class="main-wrap">
- <div class="slidey" id="tray">
- <div class="wrap">
- <form id="search" action="<?php echo search_url(); ?>" method="post">
- <label for="term">Rechercher sur ce site:</label>
- <input type="search" id="term" name="term" placeholder="Rechercher…" value="<?php echo search_term(); ?>">
- <input type="hidden" id="whatSearch" name="whatSearch" value="all" />
- </form>
-
- <aside>
- <?php if(total_categories() > 1): ?>
- <b>Categories</b>
- <ul>
- <?php while(categories()):
- if (category_count() > 0) { ?>
- <li>
- <a href="<?php echo category_url(); ?>" title="<?php echo category_description(); ?>">
- <?php echo category_title(); ?> <span><?php echo category_count(); ?></span>
- </a>
- </li>
- <?php } endwhile; ?>
- </ul>
- <?php endif; ?>
- </aside>
- </div>
- </div>
<header id="top">
@@ -84,7 +60,7 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
- <ul>
+
<?php if(has_menu_items()):
while(menu_items()): ?>
<li <?php echo (menu_active() ? 'class="active"' : ''); ?>>
@@ -97,8 +73,15 @@
<li class="tray">
<a href="#tray" class="linky"><img src="<?php echo theme_url('img/categories.png'); ?>" alt="Categories" title="Articles par catégories"></a>
</li>
+
+ <form class="navbar-form navbar-left">
+ <div class="form-group">
+ <input type="text" class="form-control" placeholder="Search">
+ </div>
+ <button type="submit" class="btn btn-default">Submit</button>
+ </form>
</ul>
- </ul>
+
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>