minor tweaks

8 files changed, 22 insertions, 24 deletions

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 54f421a..dbef94a 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,6 +1,6 @@
 {{ partial "head" . }}
-<article id="main-content" class="container main_content list">
-  <header class="container">
+<div id="main-content" class="container">
+  <header>
     {{ partial "bloc/content/h1-title" . }}
   </header>
   <ul class="container content">
@@ -9,5 +9,5 @@
     {{ end }}
   </ul>
   {{ partial "bloc/content/pagination.html" . }}
-</article>
+</div>
 {{ partial "foot" . }}
diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index d115672..ac541d3 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -1,11 +1,11 @@
 {{ partial "head" . }}
-<section id="main-content" class="container main_content section">
-  <header class="container">
+<div id="main-content" class="container">
+  <header>
     {{ partial "bloc/content/h1-title" . }}
   </header>
   {{ range $index, .Paginator.Pages }}
     {{ .Render "section.li" }}
   {{ end }}
   {{ partial "bloc/content/pagination" . }}
-</section>
+</div>
 {{ partial "foot" . }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index ec5e77d..7e13297 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,6 +1,6 @@
 {{ partial "head" . }}
-<article id="main-content" class="container main_content terms">
-  <header class="container">
+<div id="main-content" class="container">
+  <header>
     {{ partial "bloc/content/h1-title" . }}
   </header>
   <ul class="container content">
@@ -17,5 +17,5 @@
     </li>
   {{ end }}
   </ul>
-</article>
+</div>
 {{ partial "foot" . }}
diff --git a/layouts/partials/base/footer.html b/layouts/partials/base/footer.html
index efb23b5..fecf6d9 100644
--- a/layouts/partials/base/footer.html
+++ b/layouts/partials/base/footer.html
@@ -1,12 +1,10 @@
 <footer class="footer">
-    <div class="container">
+    <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">
-          <div class="margin-10">
-                {{ partial "bloc/footer/nav" . }}
-          </div>
+           {{ partial "bloc/footer/nav" . }}
         </div>
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 text-center">
           <small>
diff --git a/layouts/partials/base/header.html b/layouts/partials/base/header.html
index 74471d4..434bad9 100644
--- a/layouts/partials/base/header.html
+++ b/layouts/partials/base/header.html
@@ -12,12 +12,12 @@
       </div>
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right">
-            <li><a href="{{ .Site.BaseURL }}">Home</a></li>
-            <li><a href="{{ "/page/about/" | absURL }}">About</a></li>
-            <li><a href="{{ "/page/resume/"| absURL }}">Resume</a></li>
-            <li><a href="{{ "/post/"| absURL }}">Blog</a></li>
+          {{ range .Site.Data.Menu }}
+          <li><a href="{{ .URL | absURL }}"{{ if and ( isset . "Title" ) ( ne .Title "" ) }} title="{{ .Title }}"{{ end }}>{{ .Name }}</a></li>
+          {{ end }}
         </ul>
       </div>
+
       <!--/.nav-collapse -->
     </div>
   </nav>
diff --git a/layouts/partials/bloc/footer/nav.html b/layouts/partials/bloc/footer/nav.html
index 5bcc292..85b2052 100644
--- a/layouts/partials/bloc/footer/nav.html
+++ b/layouts/partials/bloc/footer/nav.html
@@ -1,4 +1,8 @@
-<div class="container nav foot no-print">
-  {{ partial "modules/site/link/footmenu" . }}
-  {{ partial "modules/site/link/top" . }}
+<div class="pull-left">
+  <a class="toplink" href="#">{{ if and (isset .Site.Params "toplink" ) ( ne .Site.Params.toplink "" ) }}{{ .Site.Params.topLink }}{{ else }}{{ $.Site.Data.Strings.backtotop }}{{ end }}</a>
+</div>
+<div class="pull-right">
+  {{ range .Site.Data.FootMenu }}
+  <a href="{{ .URL | absURL }}" {{ if and ( isset . "Title" ) ( ne .Title "" ) }} title="{{ .Title }}" {{ end }}>{{ .Name }}</a>
+  {{ end }}
 </div>
diff --git a/layouts/partials/modules/site/link/footmenu.html b/layouts/partials/modules/site/link/footmenu.html
deleted file mode 100644
index 8d32f40..0000000
--- a/layouts/partials/modules/site/link/footmenu.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ range .Site.Data.FootMenu }}
-<a href="{{ .URL | absURL }}"{{ if and ( isset . "Title" ) ( ne .Title "" ) }} title="{{ .Title }}"{{ end }}>{{ .Name }}</a>
-{{ end }}
diff --git a/layouts/partials/modules/site/link/top.html b/layouts/partials/modules/site/link/top.html
deleted file mode 100644
index 4e93ae6..0000000
--- a/layouts/partials/modules/site/link/top.html
+++ /dev/null
@@ -1 +0,0 @@
-<a class="toplink" href="#">{{ if and (isset .Site.Params "toplink" ) ( ne .Site.Params.toplink "" ) }}{{ .Site.Params.topLink }}{{ else }}{{ $.Site.Data.Strings.backtotop }}{{ end }}</a>