From d4fb2c4cc05aa601f2a76d0476e0c43ba8b4955f Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Sun, 18 Dec 2022 10:42:34 +0100
Subject: [PATCH] improvement: use qdouze navigation

---
 components/footer-content.php  | 15 ++++------
 components/header-content.php  |  1 +
 components/navbar-category.php | 31 ++++++++++-----------
 components/navbar-pages.php    |  8 +++---
 components/sidebar-content.php |  2 --
 scss/custom/_global.scss       | 51 ++++++++++------------------------
 style.css                      | 43 +++++++++-------------------
 7 files changed, 52 insertions(+), 99 deletions(-)

diff --git a/components/footer-content.php b/components/footer-content.php
index d2b5120..94c3b3d 100644
--- a/components/footer-content.php
+++ b/components/footer-content.php
@@ -1,22 +1,17 @@
 <footer class="bg-dark">
-  <ul class="social">
+  <nav class="container menu toolbar bg-light fg-dark">
+  <ul class="f-end">
     <?php
       $listmenu = get_nav_menu_locations();
       $menu = wp_get_nav_menu_items($listmenu['social']);
       if ($menu != null) {
         foreach ($menu as $menuElement) {
-          echo '<li class="social-li"><a class="social-link" href="'. $menuElement->url .'" title="Accéder à mon '.$menuElement->title.'" aria-label="Accéder à mon '.$menuElement->title.'"><i class="fa fa-fw fa-'.$menuElement->title.'" aria-hidden="true"></i></a></li> ';
+          echo '<li><a class="menu-item" href="'. $menuElement->url .'" title="Accéder à mon '.$menuElement->title.'" aria-label="Accéder à mon '.$menuElement->title.'"><i class="fa fa-fw fa-'.$menuElement->title.'" aria-hidden="true"></i></a></li> ';
         }
-
       }
-      ?>
-      <li class="social-li">
-        <a class="social-link" href="https://kazhnuz.space/links" title="Plus de liens" aria-label="Plus de liens">
-          <i class="fa fa-fw fa-ellipsis-h" aria-hidden="true"></i>
-        </a>
-      </li>
+    ?>
   </ul>
-
+</nav>
   <div class="container columns">
     <div class="col-md-4">
       <p>Les contenus sont diffusé sous licence Creative Common Attribution - Partage à l'Identique 4.0 - hors mention contraire.</p>
diff --git a/components/header-content.php b/components/header-content.php
index 50cb79f..f2eea47 100644
--- a/components/header-content.php
+++ b/components/header-content.php
@@ -1,4 +1,5 @@
 <header id="page-header">
   <?php include(TEMPLATEPATH . '/components/navbar-pages.php'); ?>
   <?php include(TEMPLATEPATH . '/components/logo.php'); ?>
+  <?php include(TEMPLATEPATH . '/components/navbar-category.php'); ?>
 </header>
diff --git a/components/navbar-category.php b/components/navbar-category.php
index 1db58bb..89483f2 100644
--- a/components/navbar-category.php
+++ b/components/navbar-category.php
@@ -1,19 +1,16 @@
-<nav class="navbar navbar-expand-lg navbar-dark bg-grey" id="navbar-category">
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+<nav class="container menu toolbar bg-light fg-dark categories">
+  <ul class="f-around">
+    <?php
+      $categories = get_categories( array(
+        'orderby' => 'name',
+        'order'   => 'ASC'
+      ) );
 
-  <div class="collapse navbar-collapse" id="navbarSupportedContent">
-    <ul class="navbar-nav nav-justified w-100">
-      <?php
-        $categories = get_categories( array(
-          'orderby' => 'name',
-          'order'   => 'ASC'
-        ) );
-
-        foreach( $categories as $category ) {
-          echo '<li class="nav-item"><a class="nav-link" href="' . get_category_link($category->term_id) . '">' . $category->name . '</a></li>';   
-        }?>
-    </ul>
-  </div>
+      foreach( $categories as $category ) {?>
+        <li>
+          <a class="menu-item" href="<?php echo get_category_link($category->term_id) ?>"><?php echo $category->name ?></a>
+        </li>
+      <?php }
+    ?>
+  </ul>
 </nav>
diff --git a/components/navbar-pages.php b/components/navbar-pages.php
index 5e53421..b94e410 100644
--- a/components/navbar-pages.php
+++ b/components/navbar-pages.php
@@ -2,7 +2,7 @@
   <nav class="container menu toolbar fg-light">
     <ul>
       <li>
-        <a href="<?php echo site_url(); ?>" class="btn btn-navbar">
+        <a href="<?php echo site_url(); ?>" class="menu-item">
           <i class="fa fa-home"  aria-hidden="true"></i><span class="sr-only">Accueil</span>
         </a>
       </li>
@@ -10,7 +10,7 @@
         $listmenu = get_nav_menu_locations();
         $menu = wp_get_nav_menu_items($listmenu['top-navbar']);
           foreach ($menu as $menuElement) {
-            echo '<li><a href="' . $menuElement->url . '" class="btn btn-navbar">'. $menuElement->title . '</a></li>';
+            echo '<li><a href="' . $menuElement->url . '" class="menu-item">'. $menuElement->title . '</a></li>';
           }
         ?>
     </ul>
@@ -20,10 +20,10 @@
         $listmenu = get_nav_menu_locations();
         $menu = wp_get_nav_menu_items($listmenu['top-navbar-2']);
           foreach ($menu as $menuElement) {
-            echo '<li><a href="' . $menuElement->url . '" class="btn btn-navbar">'. $menuElement->title . '</a></li>';
+            echo '<li><a href="' . $menuElement->url . '" class="menu-item">'. $menuElement->title . '</a></li>';
           }
         ?>
-      <li><a href="<?php bloginfo('rss2_url'); ?>" class="btn btn-navbar"><i class="fa fa-rss"  aria-hidden="true"></i><span class="sr-only">Flux RSS du site</span></a></li>
+      <li><a href="<?php bloginfo('rss2_url'); ?>" class="menu-item"><i class="fa fa-rss"  aria-hidden="true"></i><span class="sr-only">Flux RSS du site</span></a></li>
     </ul>
   </nav>
 </div>
diff --git a/components/sidebar-content.php b/components/sidebar-content.php
index 62bd264..53be31f 100644
--- a/components/sidebar-content.php
+++ b/components/sidebar-content.php
@@ -1,5 +1,3 @@
 <?php include(TEMPLATEPATH . '/components/sidebar/last-articles.php'); ?>
 <?php include(TEMPLATEPATH . '/components/sidebar/categories.php'); ?>
-<?php include(TEMPLATEPATH . '/components/sidebar/tags.php'); ?>
 <?php include(TEMPLATEPATH . '/components/sidebar/archives.php'); ?>
-<?php include(TEMPLATEPATH . '/components/sidebar/links.php'); ?>
diff --git a/scss/custom/_global.scss b/scss/custom/_global.scss
index 4218f9d..2667620 100644
--- a/scss/custom/_global.scss
+++ b/scss/custom/_global.scss
@@ -32,6 +32,7 @@
 
 #page-header {
     background: $color-primary url('img/background.png');
+    margin-bottom:1.5rem;
 }
 
 header h1 {
@@ -71,6 +72,11 @@ header h1 {
     @include li-no-margin();
 }
 
+.categories {
+  font-weight:800;
+  font-size:0.8rem;
+}
+
 .dropdown-menu {
     box-shadow: $narrow-shadow, $inset-shadow;
 }
@@ -197,44 +203,17 @@ body {
 
 footer {
     color: $color-footer-text;
-    padding-top:1.5rem;
-    font-size: 0.8rem!important;
     padding-bottom:1.5rem;
-
-    a,
-    a:visited {
-      &:hover,
-      &:active,
-      &:visited {
-        color: $color-footer-text;
-      }
-    }
-}
-
-/* social media */
-
-ul.social {
-    font-size:1.5em;
-    padding-bottom:1.5em;
-    margin:auto;
-    text-align:center;
-    li {
-        margin:0;
-        list-style: none;
-        display: inline;
-        a, a:visited {
-            color: $color-footer-back;
-            background-color: $color-footer-text;
-            padding:0.3em;
-            padding-left:0.36em;
-            padding-right:0.36em;
-            vertical-align:middle;
-            border-radius:100%;
-            &:hover {
-                color:$color-footer-text;
-                background-color: $color-footer-back;
-            }
+    .columns {
+      font-size:0.8rem;
+      a,
+      a:visited {
+        &:hover,
+        &:active,
+        &:visited {
+          color: $color-footer-text;
         }
+      }
     }
 }
 
diff --git a/style.css b/style.css
index 028ec24..c4bac7b 100644
--- a/style.css
+++ b/style.css
@@ -2749,7 +2749,8 @@ th {
 
 /* ------------------ HEADERS ------------------- */
 #page-header {
-  background: #e33d22 url("img/background.png"); }
+  background: #e33d22 url("img/background.png");
+  margin-bottom: 1.5rem; }
 
 header h1 {
   border-style: none !important;
@@ -2781,6 +2782,10 @@ header h1 {
   .navbar li {
     margin: 0; }
 
+.categories {
+  font-weight: 800;
+  font-size: 0.8rem; }
+
 .dropdown-menu {
   box-shadow: 0px 1px 2px rgba(0, 0, 0, 0), inset 0px -2px 0px rgba(0, 0, 0, 0); }
 
@@ -2892,36 +2897,14 @@ body {
 
 footer {
   color: #fefefe;
-  padding-top: 1.5rem;
-  font-size: 0.8rem !important;
   padding-bottom: 1.5rem; }
-  footer a:hover, footer a:active, footer a:visited,
-  footer a:visited:hover,
-  footer a:visited:active,
-  footer a:visited:visited {
-    color: #fefefe; }
-
-/* social media */
-ul.social {
-  font-size: 1.5em;
-  padding-bottom: 1.5em;
-  margin: auto;
-  text-align: center; }
-  ul.social li {
-    margin: 0;
-    list-style: none;
-    display: inline; }
-    ul.social li a, ul.social li a:visited {
-      color: #343a40;
-      background-color: #fefefe;
-      padding: 0.3em;
-      padding-left: 0.36em;
-      padding-right: 0.36em;
-      vertical-align: middle;
-      border-radius: 100%; }
-      ul.social li a:hover, ul.social li a:visited:hover {
-        color: #fefefe;
-        background-color: #343a40; }
+  footer .columns {
+    font-size: 0.8rem; }
+    footer .columns a:hover, footer .columns a:active, footer .columns a:visited,
+    footer .columns a:visited:hover,
+    footer .columns a:visited:active,
+    footer .columns a:visited:visited {
+      color: #fefefe; }
 
 .container-article {
   margin: auto;