more changes for bootstrap

15 files changed, 58 insertions, 44 deletions

diff --git a/layouts/partials/base/footer.html b/layouts/partials/base/footer.html
index fecf6d9..59b576c 100644
--- a/layouts/partials/base/footer.html
+++ b/layouts/partials/base/footer.html
@@ -1,8 +1,6 @@
 <footer class="footer">
     <div class="container hidden-print">
     <div class="row">
-        {{ partial "footer-extra" . }}
-
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
            {{ partial "bloc/footer/nav" . }}
         </div>
diff --git a/layouts/partials/base/header.html b/layouts/partials/base/header.html
index 434bad9..81e7930 100644
--- a/layouts/partials/base/header.html
+++ b/layouts/partials/base/header.html
@@ -13,11 +13,21 @@
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right">
           {{ range .Site.Data.Menu }}
-          <li><a href="{{ .URL | absURL }}"{{ if and ( isset . "Title" ) ( ne .Title "" ) }} title="{{ .Title }}"{{ end }}>{{ .Name }}</a></li>
+          <li>
+
+            <a href="{{ .URL | absURL }}"
+            {{ if and ( isset . "Title" ) ( ne .Title "" ) }} title="{{ .Title }}"{{ end }}>
+
+            {{ if and ( isset . "IconClass" ) ( ne .IconClass "" )  }}
+                <i class="fa {{ .IconClass }}"></i>
+            {{ end }}
+            
+            {{ .Name }}
+            </a>
+          </li>
           {{ end }}
         </ul>
       </div>
-
       <!--/.nav-collapse -->
     </div>
   </nav>
diff --git a/layouts/partials/base/imports.html b/layouts/partials/base/imports.html
index 4fb8312..c553e9d 100644
--- a/layouts/partials/base/imports.html
+++ b/layouts/partials/base/imports.html
@@ -3,9 +3,6 @@
 <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 {{ "<![endif]-->" | safeHTML }}
 
-<link href='https://fonts.googleapis.com/css?family=Merriweather:300%7CRaleway%7COpen+Sans'
-                  rel='stylesheet' type='text/css'>
-
 <!-- selection of themed bootstrap css to load-->
 {{ if isset .Site.Params "theme" }}
     <link rel="stylesheet" href="{{ "/css/theme/" | absURL }}{{ .Site.Params.theme.name }}.css">
@@ -15,4 +12,9 @@
 
 <link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | absURL }}">
 <link rel="stylesheet" href="{{ "/css/style.css" | absURL }}">
-{{ if isset .Site.Params "highlight" }}<link rel="stylesheet" href="{{ "/css/highlight/" | absURL }}{{ .Site.Params.highlight }}.css">{{ end }}
+
+{{ if isset .Site.Params "highlight" }}
+  <link rel="stylesheet" href="{{ "/css/highlight/" | absURL }}{{ .Site.Params.highlight }}.css">
+{{ else }}
+  <link rel="stylesheet" href="{{ "/css/highlight/" | absURL }}default.css">
+{{ end }}
diff --git a/layouts/partials/base/scripts.html b/layouts/partials/base/scripts.html
index cca731e..faea3b0 100644
--- a/layouts/partials/base/scripts.html
+++ b/layouts/partials/base/scripts.html
@@ -17,10 +17,8 @@
 </script>
 {{ end }}
 
-{{ with .Site.Params.highlight }}
 <script src="{{ "/js/highlight.pack.js" | absURL }}"></script>
 <script>hljs.initHighlightingOnLoad();</script>
-{{ end }}
 
 {{ with .Site.Params.googleplus }}
 <script>
diff --git a/layouts/partials/bloc/content/pagination.html b/layouts/partials/bloc/content/pagination.html
index 58d974b..1778d14 100644
--- a/layouts/partials/bloc/content/pagination.html
+++ b/layouts/partials/bloc/content/pagination.html
@@ -1,5 +1,7 @@
 {{ if gt $.Paginator.TotalPages 1 }}
-<div class="container pagination">
-  {{ partial "modules/site/pagination.html" . }}
-</div>
+<nav>
+  <ul class="pagination">
+    {{ partial "modules/site/pagination.html" . }}
+  </ul>
+</nav>
 {{ end }}
diff --git a/layouts/partials/foot-extra.html b/layouts/partials/foot-extra.html
deleted file mode 100644
index e69de29..0000000
--- a/layouts/partials/foot-extra.html
+++ /dev/null
diff --git a/layouts/partials/foot.html b/layouts/partials/foot.html
index 4b021f6..7e19b42 100644
--- a/layouts/partials/foot.html
+++ b/layouts/partials/foot.html
@@ -1,5 +1,4 @@
       {{ partial "base/footer" . }}
     {{ partial "base/scripts" . }}
-    {{ partial "foot-extra" . }}
   </body>
 </html>
diff --git a/layouts/partials/footer-extra.html b/layouts/partials/footer-extra.html
deleted file mode 100644
index 3359754..0000000
--- a/layouts/partials/footer-extra.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!--
-<div id="main-footer-extra" class="container extra">
-  {{ partial "modules/hugo-version" . }}
-</div>
--->
diff --git a/layouts/partials/head-extra.html b/layouts/partials/head-extra.html
deleted file mode 100644
index e69de29..0000000
--- a/layouts/partials/head-extra.html
+++ /dev/null
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 9ee803d..48db8e7 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -8,7 +8,6 @@
   <title>{{ .Title }} {{ if ne .Title .Site.Title }} &middot; {{ .Site.Title }}{{ end }}</title>
   {{ partial "base/metas" . }}
   {{ partial "base/imports" . }}
-  {{ partial "head-extra" . }}
 </head>
 <body{{ with .Site.Params.theme }} class="{{ . }}"{{ end }}>
     {{ partial "base/header" . }}
diff --git a/layouts/partials/header-extra.html b/layouts/partials/header-extra.html
deleted file mode 100644
index 2ac4d78..0000000
--- a/layouts/partials/header-extra.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!--
-<div id="main-header-extra" class="container extra">
-  {{ partial "modules/flattr" . }}
-</div>
--->
diff --git a/layouts/partials/homepage.html b/layouts/partials/homepage.html
index df71628..955012a 100644
--- a/layouts/partials/homepage.html
+++ b/layouts/partials/homepage.html
@@ -1,8 +1,10 @@
   <div class="container">
+    {{ if isset .Site.Params "showBlogHeader" }}
     <header>
       {{ partial "bloc/content/h1-title" . }}
       {{ partial "bloc/content/lastupdate" . }}
     </header>
+    {{ end }}
     {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
     {{ range $paginator.Pages }}
       {{ .Render "summary" }}
diff --git a/layouts/partials/modules/site/pagination.html b/layouts/partials/modules/site/pagination.html
index 4a4c2a4..0f06cb2 100644
--- a/layouts/partials/modules/site/pagination.html
+++ b/layouts/partials/modules/site/pagination.html
@@ -1,25 +1,33 @@
 {{ $baseurl := .Site.BaseURL }}
 {{ $pag := .Paginator }}
 {{ if gt $pag.TotalPages 1 }}
-<a aria-label="First" href="{{ $baseurl }}{{ $pag.First.URL }}">
-  <span aria-hidden="true">««</span>
-</a>
-
-<a{{ if not $pag.HasPrev }} class="disabled"{{ end }} aria-label="Previous" href="{{ if $pag.HasPrev }}{{ $baseurl }}{{ $pag.Prev.URL }}{{ else }}#{{ end }}">
-  <span aria-hidden="true">«</span>
-</a>
+<li {{ if not $pag.HasPrev }} class="disabled" {{ end }}>
+  <a aria-label="First" href="{{ $baseurl }}{{ $pag.First.URL }}">
+    <span aria-hidden="true">&laquo;&laquo;</span>
+  </a>
+</li>
 
+<li {{ if not $pag.HasPrev }} class="disabled" {{ end }}>
+  <a aria-label="Previous" href="{{ if $pag.HasPrev }}{{ $baseurl }}{{ $pag.Prev.URL }}{{ else }}#{{ end }}">
+    <span aria-hidden="true">&laquo;</span>
+    </a>
+</li>
 {{ range $pag.Pagers }}
-<a{{ if eq . $pag }} class="active"{{ end }} href="{{ $baseurl }}{{ .URL }}">
-  {{ .PageNumber }}
-</a>
+<li {{ if eq . $pag }} class="active" {{ end }}>
+  <a href="{{ $baseurl }}{{ .URL }}">
+    {{ .PageNumber }}
+    </a>
+</li>
 {{ end }}
 
-<a{{ if not $pag.HasNext }} class="disabled"{{ end }} aria-label="Next" href="{{ if $pag.HasNext }}{{ $baseurl }}{{ $pag.Next.URL }}{{ else }}#{{ end }}">
-  <span aria-hidden="true">»</span>
-</a>
-
-<a aria-label="Last" href="{{ $baseurl }}{{ $pag.Last.URL }}">
-  <span aria-hidden="true">»»</span>
-</a>
+<li {{ if not $pag.HasNext }} class="disabled" {{ end }}>
+  <a aria-label="Next" href="{{ if $pag.HasNext }}{{ $baseurl }}{{ $pag.Next.URL }}{{ else }}#{{ end }}">
+    <span aria-hidden="true">&raquo;</span>
+    </a>
+</li>
+<li {{ if not $pag.HasNext }} class="disabled" {{ end }}>
+  <a aria-label="Last" href="{{ $baseurl }}{{ $pag.Last.URL }}">
+    <span aria-hidden="true">&raquo;&raquo;</span>
+  </a>
+</li>
 {{ end }}
diff --git a/layouts/post/single.hat.html b/layouts/post/single.hat.html
index e508db5..37b1cd7 100644
--- a/layouts/post/single.hat.html
+++ b/layouts/post/single.hat.html
@@ -1,4 +1,7 @@
 <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-  {{ partial "bloc/content/h1-title" . }}
-  {{ partial "bloc/content/metas" . }}
+  <div class="text-center">
+
+    {{ partial "bloc/content/h1-title" . }}
+    {{ partial "bloc/content/metas" . }}
+  </div>
 </div>
diff --git a/static/css/style.css b/static/css/style.css
index e7e11ac..86af7b4 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,3 +1,5 @@
+@import url(https://fonts.googleapis.com/css?family=Open+Sans);
+
 /* Sticky footer styles
 -------------------------------------------------- */
 html {
@@ -6,6 +8,7 @@ html {
 }
 body {
     /* Margin bottom by footer height */
+    font-family: 'Open Sans', 'sans-serif';
     margin-bottom: 60px;
 }
 .footer {