diff --git a/css/reset.css b/css/reset.css
index c1a2a1381521e1a18e454e0f65677ff92a531874..804149330c1c103480dc139c7c842b589952afd3 100644
--- a/css/reset.css
+++ b/css/reset.css
@@ -46,6 +46,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a{
#logo {
font-family: Revalia;
font-weight: 300;
+ color: #556d5f;
}
pr, code, .mono {
@@ -83,8 +84,8 @@ a {
*/
.wrap {
min-width: 280px;
- max-width: 850px;
- width: 60%;
+ max-width: 1024px;
+ width: 80%;
margin: 0 auto;
}
diff --git a/css/style.css b/css/style.css
index 169c6d9b4e055310aeded35b4e473592235fcf71..3ea548f94bc97fb13f295c2c6d6ed2d8c5d0bc99 100644
--- a/css/style.css
+++ b/css/style.css
@@ -18,8 +18,7 @@ h2{
}
#top {
- margin: 20px;
- padding-bottom: 10%;
+ #margin: 20px;
background: #fff;
border-bottom: 1px solid rgba(22,54,36,.1);
}
diff --git a/functions.php b/functions.php
index 1d5a78b4129345e376177263f74a95c85c715172..9167560ce69dbdcbfe472fad6906536faf5db856 100644
--- a/functions.php
+++ b/functions.php
@@ -122,8 +122,8 @@ function article_img($slug){
}
function print_item($item, $class){
- echo '<li class="'.$class.'">';
- echo '<a href="'.menu_url($item).'" title="'.menu_title($item).'">';
+ echo '<li class=" '.$class.'">';
+ echo '<a class="nav-link" href="'.menu_url($item).'" title="'.menu_title($item).'">';
echo menu_name($item).' </a></li>';
}
@@ -131,20 +131,21 @@ function build_menu($parent, $tree){
foreach($tree[$parent] as $i => $item){
$class=menu_active($item)&&$parent==0?'active':'';
if(array_key_exists($item->id, $tree)){
- echo '<li class="dropdown '.$class.'"><a class="dropdown-toggle" data-toggle="dropdown" href="#">'.menu_name($item).'<span class="caret"></span></a>';
+ echo '<li class=" dropdown '.$class.'">';
+ echo '<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">'.menu_name($item).'<span class="caret"></span></a>';
echo '<ul class="dropdown-menu">';
build_menu($item->id, $tree);
echo '</ul>';
echo '</li>';
}else{
if(menu_name($item) == "Blog"){
- echo '<li class="dropdown '.$class.'"><a class="dropdown-toggle" data-toggle="dropdown" href="#">'.menu_name($item).'<span class="caret"></span></a>';
+ echo '<li class=" dropdown '.$class.'"><a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">'.menu_name($item).'<span class="caret"></span></a>';
echo '<ul class="dropdown-menu">';
- echo '<li><a href="'.menu_url($item).'" title="Tous les articles">';
+ echo '<li><a class="nav-link" href="'.menu_url($item).'" title="Tous les articles">';
echo 'Tous les articles </a></li>';
while(categories()){
if(category_count() > 0 ){
- echo '<li><a href="'.category_url().'" title="'.category_title().'">';
+ echo '<li><a class="nav-link" href="'.category_url().'" title="'.category_title().'">';
echo category_title().' </a></li>';
}
}
diff --git a/header.php b/header.php
index cc72512c3588f9d3e91e0d983b893a8d0adc8cd4..581ca43915fb1439ead7ed57b04adeea58ebd8cf 100644
--- a/header.php
+++ b/header.php
@@ -5,7 +5,7 @@
<title><?php echo page_title('Page non trouvé'); ?> - <?php echo site_name(); ?></title>
<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="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
<link rel="stylesheet" href="<?php echo theme_url('/css/reset.css'); ?>">
<link rel="stylesheet" href="<?php echo theme_url('/css/style.css'); ?>">
@@ -21,8 +21,9 @@
<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>
+ <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
+ <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
<meta name="viewport" content="width=device-width">
<meta name="generator" content="Anchor CMS">
@@ -39,44 +40,31 @@
<body class="<?php echo body_class(); ?>">
<header id="top">
-
- <nav class="navbar navbar-default navigation col-md-12" id="main" >
- <div class="container-fluid">
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header">
-
- <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>
- </div>
- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav">
-
+ <nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-end">
+ <a class="navbar-brand" 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(); ?>">
+ </a>
+ <ul class="navbar-nav">
+ <li class="">
+ <a class="nav-link" id="logo"><?php echo site_description(); ?></a>
+ </li>
+ </ul>
+ <button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target="#navbarsExample03" aria-controls="navbarsExample03" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+
+ <div class="collapse navbar-collapse flex-grow-0 ml-auto" id="navbarsExample03">
+ <ul class="navbar-nav mr-auto">
<?php echo menu_tree();?>
-
- <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…" value="">
- <input type="hidden" id="whatSearch" name="whatSearch" value="all" />
- </div>
- </form>
- </li>
- </ul>
-
- </div><!-- /.navbar-collapse -->
- </div><!-- /.container-fluid -->
- </nav>
-
+ <li class="">
+ <form class="form-inline my-2 my-md-0">
+ <input type="search" id="term" name="term" class="form-control" placeholder="Rechercher…" value="">
+ <input type="hidden" id="whatSearch" name="whatSearch" value="all" />
+ </form>
+ </li>
+ </ul>
+ </div>
+ </nav>
</header>
diff --git a/posts.php b/posts.php
index 9c318c54ed816a0e822b8f2eaa034c42cab9a4e1..fd2c68bbe706159aa252c2fd4e9802950ffa743a 100644
--- a/posts.php
+++ b/posts.php
@@ -5,15 +5,13 @@
$title="";
$text="";
if (preg_match('/category.*/',current_url())){
- echo "<p id='".current_url()."'></p>";
while(categories()){
- echo "<p id='".category_url()."'></p>";
if(category_url() == "/".current_url()){
$title.="".category_title();
$text=' <span style="font-size:large"> - '.category_description()."</span>";
}
}
- echo '<h1 >'.$title.$text."</h1>\n";
+ echo '<h1 style="margin-left:25%">'.$title.$text."</h1>\n";
}
?>
<?php if(has_posts()): ?>